[Bf-blender-cvs] [0fb6b7a] multiview: Merge branch 'master' into multiview

[Campbell Barton]

Commit: 0fb6b7a71f96c376a676867957653396c1ca99f2
Author: Campbell Barton
Date:   Mon Nov 24 09:58:21 2014 +0100
Branches: multiview
https://developer.blender.org/rB0fb6b7a71f96c376a676867957653396c1ca99f2

Merge branch 'master' into multiview

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



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