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

[Lukas Tönne]

Commit: 2204bb092b6183377a9aa7b532c4b42d66e2dda6
Author: Lukas Tönne
Date:   Fri Dec 5 11:23:38 2014 +0100
Branches: strand_gpu
https://developer.blender.org/rB2204bb092b6183377a9aa7b532c4b42d66e2dda6

Merge branch 'master' into mesh_samples

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



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