[Bf-blender-cvs] [7d1e7de] viewport_experiments: Merge branch 'master' into viewport_experiments

[Antony Riakiotakis]

Commit: 7d1e7de7be6611908a7788a2201ccfea712306e5
Author: Antony Riakiotakis
Date:   Tue Feb 3 19:29:37 2015 +0100
Branches: viewport_experiments
https://developer.blender.org/rB7d1e7de7be6611908a7788a2201ccfea712306e5

Merge branch 'master' into viewport_experiments

Conflicts:
	CMakeLists.txt

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



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