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

[Nicholas Bishop]

Commit: c76f130e3e4ac967d483faa1a63a0ac158d46c0c
Author: Nicholas Bishop
Date:   Mon Feb 9 12:04:44 2015 +0100
Branches: cycles-ptex-49
https://developer.blender.org/rBc76f130e3e4ac967d483faa1a63a0ac158d46c0c

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

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



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