Merge branch 'master' into packer/vorix 53/head
authorMirio <opivy@hotmail.de>
Wed, 26 Oct 2016 22:35:07 +0000 (00:35 +0200)
committerMirio <opivy@hotmail.de>
Wed, 26 Oct 2016 22:35:07 +0000 (00:35 +0200)
commit2848e3a98f3af541a39e7653078b330a3ba9c3e4
treef8e75b14d00353cc7a34f503810d8b0518073347
parentf210999ed25e066ccdb029f2eec8c4012d690a9d
parent71d8c7e6237e3ade3c35e46e35d13cd9f6fb156b
Merge branch 'master' into packer/vorix