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

[Bastien Montagne]

Commit: a96add0cc331da800009f10f63693d520a9f4215
Author: Bastien Montagne
Date:   Tue Aug 19 16:03:20 2014 +0200
Branches: dxf_import
https://developer.blender.org/rBAa96add0cc331da800009f10f63693d520a9f4215

Merge branch 'master' into dxf_import

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



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