Merge branch 'master' into amade/finalrage
authorMirio <opivy@hotmail.de>
Tue, 5 May 2015 12:22:06 +0000 (14:22 +0200)
committerMirio <opivy@hotmail.de>
Tue, 5 May 2015 12:22:06 +0000 (14:22 +0200)

Trivial merge