Merge branch 'master' into android
[fanfix.git] / VERSION
1 2.0.2-dev