Merge pull request #153 from HRogge/for-14.07
authorBastian Bittorf <bittorf@bluebottle.com>
Fri, 4 Mar 2016 14:55:58 +0000 (15:55 +0100)
committerBastian Bittorf <bittorf@bluebottle.com>
Fri, 4 Mar 2016 14:55:58 +0000 (15:55 +0100)
commit16e47205340886eec6f9c4baf4339f4a61c8b4e1
treecf7fd404499701edc03ae9f3baf6e7525d614ce9
parent2e704cd29e05fe31b736969874d60f27923a3901
parent5e24cbc0698d94f0c1f28e9b25b7e33ff0fa9c55
Merge pull request #153 from HRogge/for-14.07

For 14.07