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

[Lukas Tönne]

Commit: 47d024c2b0b9217431aeed9a71987a6a4614b5e1
Author: Lukas Tönne
Date:   Mon Mar 3 11:56:02 2014 +0100
Branches: strand_gpu
https://developer.blender.org/rB47d024c2b0b9217431aeed9a71987a6a4614b5e1

Merge branch 'master' into mesh_samples

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



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