[Bf-blender-cvs] [3361788] strand_gpu: Merge branch 'master' into mesh_samples

[Lukas Tönne]

Commit: 3361788b1c166b6b03a133f79d64ad7853221824
Author: Lukas Tönne
Date:   Sun Nov 30 10:08:09 2014 +0100
Branches: strand_gpu
https://developer.blender.org/rB3361788b1c166b6b03a133f79d64ad7853221824

Merge branch 'master' into mesh_samples

Conflicts:
	release/datafiles/locale
	release/scripts/addons

===================================================================



===================================================================