[Bf-blender-cvs] [c6110bf] GPencil_EditStrokes: Merge branch 'master' into GPencil_EditStrokes

[Joshua Leung]

Commit: c6110bf156009caa9ec0bed06a4a1abfc829eb20
Author: Joshua Leung
Date:   Wed Oct 15 00:03:42 2014 +1300
Branches: GPencil_EditStrokes
https://developer.blender.org/rBc6110bf156009caa9ec0bed06a4a1abfc829eb20

Merge branch 'master' into GPencil_EditStrokes

Conflicts:
	release/scripts/startup/bl_ui/space_view3d_toolbar.py

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



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