[Bf-blender-cvs] [8ebe85f] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: 8ebe85f73300080eb55b3c4adf13916aec561103
Author: Bastien Montagne
Date:   Thu Jan 29 19:37:50 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rB8ebe85f73300080eb55b3c4adf13916aec561103

Merge branch 'master' into asset-experiments

Conflicts:
	release/scripts/startup/bl_operators/wm.py

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



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

diff --cc release/scripts/startup/bl_operators/wm.py
index 5fe443d,a48415c..8954291
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@@ -20,13 -20,13 +20,14 @@@
  
  import bpy
  from bpy.types import Operator
- from bpy.props import (StringProperty,
-                        BoolProperty,
-                        IntProperty,
-                        FloatProperty,
-                        EnumProperty,
-                        CollectionProperty,
-                        )
+ from bpy.props import (
+         StringProperty,
+         BoolProperty,
+         IntProperty,
+         FloatProperty,
+         EnumProperty,
++        CollectionProperty,
+         )
  
  from bpy.app.translations import pgettext_tip as tip_