Merge branch 'release' into bug-964
authorMichael Tänzer <neo@nhng.de>
Mon, 23 Jul 2012 15:40:24 +0000 (17:40 +0200)
committerMichael Tänzer <neo@nhng.de>
Mon, 23 Jul 2012 15:40:24 +0000 (17:40 +0200)
commite0f7339704f2e6045774301b0359be3502f4b486
treeb8560ed68f42b15585611bba78627740140a80d7
parent30ac5366838978bd685da21208974c83883cd9d6
parentfd4fbe21e9ef63c555469b595f7748fadfb977f4
Merge branch 'release' into bug-964