Merge branch 'master' into justin/erbium
authorMirio <opivy@hotmail.de>
Tue, 25 Oct 2016 22:21:15 +0000 (00:21 +0200)
committerMirio <opivy@hotmail.de>
Tue, 25 Oct 2016 22:21:15 +0000 (00:21 +0200)
commitcda67c2632f5c6272cdf418bfba8335d6bfd784f
treed3781eb30001b3bce490f2aebeeb09eda9eca26e
parent1c53adcf24bdc6f6191a3a097ed791a0c6d0aeed
parent14d35acc1b569b6330de5ae293f11dae8e5e4f8c
Merge branch 'master' into justin/erbium