Merge remote-tracking branch 'origin/bug-1213' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 6 Nov 2013 15:07:34 +0000 (16:07 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 6 Nov 2013 15:07:34 +0000 (16:07 +0100)
commitb65dcec9da0414797ecd43af71a755df99c324c5
tree275744eb581202e4c7d9b5d7d05bb0a5dd8c91fa
parent234b43aca01ba78b9aff492591f84187ca12a664
parent661dee916f4be9c6d6847376ca8c31c21be37db1
Merge remote-tracking branch 'origin/bug-1213' into release