Merge branch 'support/2.4'
authorGunnar Beutner <gunnar.beutner@netways.de>
Wed, 20 Apr 2016 16:50:52 +0000 (18:50 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Wed, 20 Apr 2016 16:50:52 +0000 (18:50 +0200)
commitd1e6cdf62c64b82e41da5b77a7e239d09204dcb1
treec15dc027f96cf1472f818cfb1eb7c1497030154c
parentdf25ee49bab975b67518fecc82d72e8145ed39b0
parent5c8a31423f2994c7f79eb31851f6fcd2ae366bd6
Merge branch 'support/2.4'