merged from trunk 20741:20848
[blender-staging.git] / release / VERSION
1 2.5-devel