Merge branch 'bug-1003' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 25 Jul 2012 00:37:48 +0000 (02:37 +0200)
committerMichael Tänzer <neo@nhng.de>
Wed, 25 Jul 2012 00:37:48 +0000 (02:37 +0200)
commit7d24a41b1a42a3a3325278d7a50b403f702206e6
treeadd146e3ecd5edee7306336d6f6b25b4eda85184
parentb4e46cf744412cc06e5abd83d0d01e27971e8d0e
parent34df6b74fb581efd9c4a19d26f10a08501386492
Merge branch 'bug-1003' into release