[Bf-blender-cvs] [ad29094f91e] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: ad29094f91ef998f2496941ed33d62cf3def46dc
Author: Antonio Vazquez
Date:   Mon Jan 8 10:41:43 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBad29094f91ef998f2496941ed33d62cf3def46dc

Merge branch 'blender2.8' into greasepencil-object

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

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



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