Merge branch 'master' into mirio/glowplant
authorMirio <opivy@hotmail.de>
Fri, 23 Jan 2015 19:10:45 +0000 (20:10 +0100)
committerMirio <opivy@hotmail.de>
Fri, 23 Jan 2015 19:10:45 +0000 (20:10 +0100)
commit77445248ff6c3e6996b4307afb8008c9c137bc95
tree9921bf36e26f71748b54e7a769752355cae045c3
parent3e918cbef1a0376b716884ad880c9e3564dc9fe4
parent208ff8cecfd188d3b8b7b9203a216dae9256f622
Merge branch 'master' into mirio/glowplant