[Bf-blender-cvs] [678e5a7] temp-text_editor_cursor_api: Merge remote-tracking branch 'refs/remotes/origin/master' into temp-text_editor_cursor_api

[Martin Felke]

Commit: 678e5a783e8ca83822f90d0ce7211125d821f904
Author: Martin Felke
Date:   Fri Jan 2 15:44:22 2015 +0100
Branches: temp-text_editor_cursor_api
https://developer.blender.org/rB678e5a783e8ca83822f90d0ce7211125d821f904

Merge remote-tracking branch 'refs/remotes/origin/master' into temp-text_editor_cursor_api

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



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