[Bf-blender-cvs] [5a535bb] gooseberry: Merge branch 'master' into gooseberry

[Bastien Montagne]

Commit: 5a535bb5b0012de4ecb1b1d02821f52f059021d4
Author: Bastien Montagne
Date:   Sun Jan 11 18:51:01 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB5a535bb5b0012de4ecb1b1d02821f52f059021d4

Merge branch 'master' into gooseberry

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



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