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

[Lukas Tönne]

Commit: a30f9ffa87856ea7c0550c3b76445d1b7d6da012
Author: Lukas Tönne
Date:   Mon Dec 1 14:29:09 2014 +0100
Branches: strand_gpu
https://developer.blender.org/rBa30f9ffa87856ea7c0550c3b76445d1b7d6da012

Merge branch 'master' into mesh_samples

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

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



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