[Bf-blender-cvs] [4bd1c13] cycles-ptex-49: Merge remote-tracking branch 'origin/master' into cycles-ptex-49

[Nicholas Bishop]

Commit: 4bd1c1313ec2d08b843bb9e29c8668a781249548
Author: Nicholas Bishop
Date:   Wed Feb 11 12:57:44 2015 +0100
Branches: cycles-ptex-49
https://developer.blender.org/rB4bd1c1313ec2d08b843bb9e29c8668a781249548

Merge remote-tracking branch 'origin/master' into cycles-ptex-49

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



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