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

[Bastien Montagne]

Commit: ae6785e1d9209c061fc74d51c7ce4da809209cd7
Author: Bastien Montagne
Date:   Fri Jul 25 15:17:22 2014 +0200
Branches: fbx_io_development
https://developer.blender.org/rBAae6785e1d9209c061fc74d51c7ce4da809209cd7

Merge branch 'master' into fbx_io_development

Conflicts:
	io_scene_fbx/import_fbx.py

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



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