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)
commitcb1c017cf2e786667c973c8e15dbccc555416d86
tree8d396973626eb89fa06131c6e063f4281815b306
parent810780abb1edad35b9117511e220723d8cb9662b
parent14bf7626cf6be2a60e47fd05bb02a9c9681c5c7f
Merge pull request #188 from HRogge/for-15.05

For 15.05