Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 22 Jun 2016 22:04:19 +0000 (08:04 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 22 Jun 2016 22:04:19 +0000 (08:04 +1000)
commitc2dc77983dc4d3271858737a15ee058ef48fb833
tree07f488e24eb2b9f9b3dfce9d15ac66dabd74b7e4
parent3b0a5dd15884aed00d988d73a72f4946673f8be9
parent29448bd99bb05ae61e4d540981026bab87702f90
Merge branch 'master' into blender2.8

No changes, just resolve conflicts.