Merge branch 'bug-953' into release
authorMichael Tänzer <neo@nhng.de>
Sun, 20 Nov 2011 01:01:05 +0000 (02:01 +0100)
committerMichael Tänzer <neo@nhng.de>
Sun, 20 Nov 2011 01:01:05 +0000 (02:01 +0100)
commitad68d81c019efeb4de8356af29cd804b64da8038
tree58d6f5c2de11a37d6abaee16668c3dc6a521f9ee
parentb681e568fa21c2fcc5c60282797661b2c4ac6aee
parent14276ff913b9c8138b44c73951b26b2d54caab85
Merge branch 'bug-953' into release