Merge branch 'bug-1075' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 25 Jul 2012 00:28:27 +0000 (02:28 +0200)
committerMichael Tänzer <neo@nhng.de>
Wed, 25 Jul 2012 00:28:27 +0000 (02:28 +0200)
commit9fe4952e31fb3025f05d5742be4493bacfbf5826
tree696daba9e44772947f7876d87936c557c0722efb
parent099af6d876b0d68f1d7e92e77c135152c33d2d89
parentc661efc9f7cd90ce8127cc3778676f51f8f5e578
Merge branch 'bug-1075' into release