Merge pull request #188 from HRogge/for-15.05
authorBastian Bittorf <bittorf@bluebottle.com>
Wed, 25 May 2016 08:15:18 +0000 (10:15 +0200)
committerBastian Bittorf <bittorf@bluebottle.com>
Wed, 25 May 2016 08:15:18 +0000 (10:15 +0200)
For 15.05


Trivial merge