Merge branch 'bug-959' into release 2011-08-01
authorMichael Tänzer <neo@nhng.de>
Mon, 1 Aug 2011 01:32:15 +0000 (03:32 +0200)
committerMichael Tänzer <neo@nhng.de>
Mon, 1 Aug 2011 01:32:15 +0000 (03:32 +0200)
commit1262ff0b1c8cf748c0dc6ed502d80c579ae672ca
tree4851d0e52d5f2ffc3d39c5a3cb0a50f5112a2bde
parent4230707947899c893fda70cd9addd592580a477e
parentf5cca0215ef95189fd24966e3260948605df0e5e
Merge branch 'bug-959' into release