Merge remote-tracking branch 'origin/bug-1045' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 20 Nov 2013 14:05:09 +0000 (15:05 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 20 Nov 2013 14:05:09 +0000 (15:05 +0100)
commitedfa0f26687ca34b391c96ba94228e6642cbbc2e
treecd89bfcd72446b321697dab05371a9e52268e896
parent4fdc024a9215ab3008b281ffabbd7924f19778b3
parentafa6d7b55b3fbe30d5ff7928ddf619f54ff554cd
Merge remote-tracking branch 'origin/bug-1045' into release