[Bf-blender-cvs] [cb41e6c] cycles_kernel_split: Merge branch 'master' into cycles_kernel_split

[Martijn Berger]

Commit: cb41e6cdb2492e37af434589d33ba6b476b84223
Author: Martijn Berger
Date:   Wed May 6 12:37:24 2015 +0200
Branches: cycles_kernel_split
https://developer.blender.org/rBcb41e6cdb2492e37af434589d33ba6b476b84223

Merge branch 'master' into cycles_kernel_split

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



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