Merge branch '1.0-pre12'
authorStricted <info@stricted.net>
Thu, 12 Jan 2017 06:39:14 +0000 (07:39 +0100)
committerStricted <info@stricted.net>
Thu, 12 Jan 2017 06:39:14 +0000 (07:39 +0100)
commitce4b5656df7eed1ca4d98d69b38828a5284e2bb7
treef02db65e8b7f0e36f5d6f9121673423f58b52354
parentfba6bae8d5b6dd7ef146616a10fc87c627dc05ea
parente2b527bc26d3c329d2c429adde67243a4c5fe38d
Merge branch '1.0-pre12'