merge trunk 16118 -> 116886
[blender-staging.git] / release / VERSION
1 2.47