Tue, 10 Dec 2013 10:43:13 +0100merge stable-1.5
Florian Pose <fp@igh-essen.com> [Tue, 10 Dec 2013 10:43:13 +0100] rev 2538
merge