[Bf-blender-cvs] [d98094a] soc-2014-cycles: Merge remote-tracking branch 'origin/master' into soc-2014-cycles

[Thomas Dinges]

Commit: d98094adde720fd7954535343afb014265705491
Author: Thomas Dinges
Date:   Sat Aug 2 14:39:54 2014 +0200
Branches: soc-2014-cycles
https://developer.blender.org/rBd98094adde720fd7954535343afb014265705491

Merge remote-tracking branch 'origin/master' into soc-2014-cycles

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



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