merging trunk 19093:19274
[blender.git] / release / VERSION
1 2.48