[Bf-extensions-cvs] [f10517d] dxf_import: Merge branch 'master' into dxf_import

[Bastien Montagne]

Commit: f10517df1584df5cb68f969a0d08ba7e1c0cc643
Author: Bastien Montagne
Date:   Mon Aug 4 19:58:15 2014 +0200
Branches: dxf_import
https://developer.blender.org/rBAf10517df1584df5cb68f969a0d08ba7e1c0cc643

Merge branch 'master' into dxf_import

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



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