Merge branch 'master' into amade/finalrage
authorMirio <opivy@hotmail.de>
Wed, 15 Apr 2015 23:32:53 +0000 (01:32 +0200)
committerMirio <opivy@hotmail.de>
Wed, 15 Apr 2015 23:32:53 +0000 (01:32 +0200)

Trivial merge