[Bf-blender-cvs] [27db9d43f6e] gsoc2016-improved_extrusion: Merge remote-tracking branch 'origin/master' into gsoc2016-improved_extrusion

[João Araújo]

Commit: 27db9d43f6ec8332bb00d2cdfc414b2cf5c0074c
Author: João Araújo
Date:   Wed Feb 1 12:04:18 2017 +0000
Branches: gsoc2016-improved_extrusion
https://developer.blender.org/rB27db9d43f6ec8332bb00d2cdfc414b2cf5c0074c

Merge remote-tracking branch 'origin/master' into gsoc2016-improved_extrusion

Conflicts:
	release/datafiles/locale
	release/scripts/addons
	release/scripts/addons_contrib

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



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

diff --cc release/scripts/addons
index 3f65672dc34,371960484a3..1a0b479eda6
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 3f65672dc348657d93c3a7b965881ebb22fcf5bf
 -Subproject commit 371960484a38fc64e0a2635170a41a0d8ab2f6bd
++Subproject commit 1a0b479eda66cd8971a2625bb4197950f03828c4