[Bf-blender-cvs] [f68663e] experimental-build: Merge remote-tracking branch 'origin/master' into experimental-build

[Dalai Felinto]

Commit: f68663edf51536c6432d818f5c482bcf0a483455
Author: Dalai Felinto
Date:   Wed Dec 3 13:00:39 2014 -0200
Branches: experimental-build
https://developer.blender.org/rBf68663edf51536c6432d818f5c482bcf0a483455

Merge remote-tracking branch 'origin/master' into experimental-build

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



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