Merge branch 'master' into 1.0-pre12
authorStricted <info@stricted.net>
Thu, 10 Nov 2016 19:26:43 +0000 (20:26 +0100)
committerStricted <info@stricted.net>
Thu, 10 Nov 2016 19:27:14 +0000 (20:27 +0100)
commit2e30b3f678d462754894424203174a64b9f6d2c1
treef4394fba789b39093097aa56459f2ef49fbe2c28
parent69507dd0936663095fa4de1eff27c6f2ceb8bfcb
parentfba6bae8d5b6dd7ef146616a10fc87c627dc05ea
Merge branch 'master' into 1.0-pre12