[Bf-extensions-cvs] [3912a93] fbx_io_development: Merge branch 'master' into fbx_io_development

[Bastien Montagne]

Commit: 3912a93d47622b2f5fd0cf437042640eb1721f4d
Author: Bastien Montagne
Date:   Sun Jul 6 19:15:15 2014 +0200
https://developer.blender.org/rBA3912a93d47622b2f5fd0cf437042640eb1721f4d

Merge branch 'master' into fbx_io_development

Conflicts:
	io_scene_fbx/export_fbx_bin.py
	io_scene_fbx/import_fbx.py

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



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