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

[Severin]

Commit: 36652982dd7cabf803ba4895d0c996685aafc8ca
Author: Severin
Date:   Mon Dec 1 17:35:11 2014 +0100
Branches: input_method_editor
https://developer.blender.org/rB36652982dd7cabf803ba4895d0c996685aafc8ca

Merge branch 'master' into ime

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



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