Merge pull request #1 from joan2937/master
authorBjoernSch <mail@bjoern-schrader.de>
Sun, 28 Feb 2016 07:59:20 +0000 (08:59 +0100)
committerBjoernSch <mail@bjoern-schrader.de>
Sun, 28 Feb 2016 07:59:20 +0000 (08:59 +0100)
Merge from upstream


Trivial merge