Merge branch 'bug-976' into release
authorMichael Tänzer <neo@nhng.de>
Sun, 20 Nov 2011 00:23:32 +0000 (01:23 +0100)
committerMichael Tänzer <neo@nhng.de>
Sun, 20 Nov 2011 00:23:32 +0000 (01:23 +0100)
commit4942782d3a52b8a067a63af5767425f6f022f83e
tree3b3598955f37a6f1e0bb955d488a41a9591df831
parent9feddd1e1f31d52a0bb4fcb5c8c0e1871ff42c25
parent70127203cfc7fd5803b99763645c181102237591
Merge branch 'bug-976' into release