Merge remote-tracking branch 'origin/bug-1111' into release
authorMichael Tänzer <neo@nhng.de>
Sun, 9 Dec 2012 23:28:20 +0000 (00:28 +0100)
committerMichael Tänzer <neo@nhng.de>
Sun, 9 Dec 2012 23:28:20 +0000 (00:28 +0100)
commit4fb198eb799295a1dc849e1313ca2f465e6d18a9
tree11eaa3727302caaef5a942f8d230a015ce03d06e
parentee8f25df194afec37acef984b9e1471ad1671658
parentfa3f2e7221e03d7a2510f9ea4d8c101b02bf9cb7
Merge remote-tracking branch 'origin/bug-1111' into release