Merge branch 'master' into Mirio/balance
authorMirio <opivy@hotmail.de>
Fri, 15 Jan 2016 15:35:51 +0000 (16:35 +0100)
committerMirio <opivy@hotmail.de>
Fri, 15 Jan 2016 15:35:51 +0000 (16:35 +0100)
commit10c0be8573ea4ab40c24c4a4267f445e00b63857
treeecac4dbb3cad00d66dd43a6645d83261af99557b
parent459087d948b39a7e2ad4b942e8069b1b46aeb797
parent38161f6989bb36be83904ca5b8a06c6cd24664da
Merge branch 'master' into Mirio/balance