Merge branch 'master' into Justin/erbium
authorMirio <opivy@hotmail.de>
Tue, 31 Jan 2017 12:56:22 +0000 (13:56 +0100)
committerMirio <opivy@hotmail.de>
Tue, 31 Jan 2017 12:56:22 +0000 (13:56 +0100)
commitf64ad4f66863c517acffa796ea6fc85e885c434f
tree65a9480979283a63088d61550ab9de819bc99ea8
parente1be03ce1d550d065b36fd872b4d8dcdf8772d22
parentc0c3ee0747bf1c8ef9c1fc9b0a8e352700ff5a18
Merge branch 'master' into Justin/erbium