Merge branch 'master' into justin/erbium
authorMirio <opivy@hotmail.de>
Wed, 26 Oct 2016 23:22:13 +0000 (01:22 +0200)
committerMirio <opivy@hotmail.de>
Wed, 26 Oct 2016 23:22:13 +0000 (01:22 +0200)
commit2a096a4ba21767db90ff3a48611ab2b5e69124e4
treea24f0121b08adae9013e148400034043a3e4236b
parent79476cce900c8658788bbd475db7d423e97060d4
parentd4f647451703feaa22b9329738d1463c1bd0861b
Merge branch 'master' into justin/erbium