Merge pull request #154 from HRogge/for-15.05
authorBastian Bittorf <bittorf@bluebottle.com>
Fri, 4 Mar 2016 14:56:01 +0000 (15:56 +0100)
committerBastian Bittorf <bittorf@bluebottle.com>
Fri, 4 Mar 2016 14:56:01 +0000 (15:56 +0100)
commitc506c492c94283c04215a924c5dab4d8ad16df09
tree996abdd53783a21adea1fe9e921344e906788a86
parent4830444a7c75113f1f503e09aba626cc7b07f03e
parent69087c2ebe3f74631952cdbbf23d1d92c1a32d20
Merge pull request #154 from HRogge/for-15.05

For 15.05