Merge branch 'bug-540' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 25 Jul 2012 00:28:17 +0000 (02:28 +0200)
committerMichael Tänzer <neo@nhng.de>
Wed, 25 Jul 2012 00:28:17 +0000 (02:28 +0200)
commit099af6d876b0d68f1d7e92e77c135152c33d2d89
treedc9acec8f8b04016cb8da95e75aa88de1c2f926b
parentfd4fbe21e9ef63c555469b595f7748fadfb977f4
parent29860eadb308d1316c62a695daa91d6f24eb6063
Merge branch 'bug-540' into release