[Bf-blender-cvs] [1254e98] input_method_editor: Merge branch 'master' into ime

[Severin]

Commit: 1254e98a48aa92bbf6e707fbc28f42bee17a264f
Author: Severin
Date:   Thu Dec 4 20:48:11 2014 +0100
Branches: input_method_editor
https://developer.blender.org/rB1254e98a48aa92bbf6e707fbc28f42bee17a264f

Merge branch 'master' into ime

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



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