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

[Nicholas Bishop]

Commit: 95be60e5c5db1135f19b28693ca6e7e45bd135d1
Author: Nicholas Bishop
Date:   Fri Feb 13 11:39:35 2015 +0100
Branches: cycles-ptex-49
https://developer.blender.org/rB95be60e5c5db1135f19b28693ca6e7e45bd135d1

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

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



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