[Bf-blender-cvs] [c69d4b6] temp-ghash-basis: Merge branch 'master' into temp-ghash-basis

[Campbell Barton]

Commit: c69d4b63b36288546b4c246b4d81b1d6d401f7a2
Author: Campbell Barton
Date:   Fri Mar 20 01:44:47 2015 +1100
Branches: temp-ghash-basis
https://developer.blender.org/rBc69d4b63b36288546b4c246b4d81b1d6d401f7a2

Merge branch 'master' into temp-ghash-basis

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



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