Merge branch 'bug-957' into release
authorMichael Tänzer <neo@nhng.de>
Mon, 26 Dec 2011 19:13:00 +0000 (20:13 +0100)
committerMichael Tänzer <neo@nhng.de>
Mon, 26 Dec 2011 19:13:00 +0000 (20:13 +0100)
commitab6709e038099a89e0f441b329ae68d5a415c666
tree84c86816ec4ff5e7e6b937713f54e022366b50fb
parente9c8fd8bfe194b4d77cdf92b9a79452bad6198dd
parent751dc567419968b285e5fa0ab34171ac3dd950dc
Merge branch 'bug-957' into release