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

[Lukas Tönne]

Commit: 56d8228713634358674a67af0facad174ffea840
Author: Lukas Tönne
Date:   Sun Oct 11 15:51:07 2015 +0200
Branches: strand_gpu
https://developer.blender.org/rB56d8228713634358674a67af0facad174ffea840

Merge branch 'master' into mesh_samples

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



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