Merge branch 'master' into packer/vorix
authorMirio <opivy@hotmail.de>
Tue, 25 Oct 2016 22:34:40 +0000 (00:34 +0200)
committerMirio <opivy@hotmail.de>
Tue, 25 Oct 2016 22:34:40 +0000 (00:34 +0200)
commitf210999ed25e066ccdb029f2eec8c4012d690a9d
tree625c8ebdb23678cbb6db0264c6466d3aab43f31a
parent08dfbd4c59bbc0cb725e69e0de7408400122270d
parent14d35acc1b569b6330de5ae293f11dae8e5e4f8c
Merge branch 'master' into packer/vorix