Merge remote-tracking branch 'origin/master' into soc-2014-cycles soc-2014-cycles
authorThomas Dinges <blender@dingto.org>
Tue, 5 Aug 2014 22:45:13 +0000 (00:45 +0200)
committerThomas Dinges <blender@dingto.org>
Tue, 5 Aug 2014 22:45:13 +0000 (00:45 +0200)
commitc689a2ea8c016d3dffda73fc5916ad2717ffc2e1
treeb76bacbe6f109671415e1744abb9dadb929a56b1
parent2c331302773bfbd725c1a9a102b7e637a46a2a2f
parent4cf531f7a05434a9bbd6144a7ec0314e60aaff40
Merge remote-tracking branch 'origin/master' into soc-2014-cycles