Merge branch 'bug-968' into release
authorMichael Tänzer <neo@nhng.de>
Sun, 20 Nov 2011 00:33:08 +0000 (01:33 +0100)
committerMichael Tänzer <neo@nhng.de>
Sun, 20 Nov 2011 00:33:08 +0000 (01:33 +0100)
commit6ff6e31cdb8e03b12860840ccfbb4a5c07af3624
tree58d6f5c2de11a37d6abaee16668c3dc6a521f9ee
parentd933011668c5731b82c23a2ae8272a9488f5640c
parent83479b23af20a17cd59feb89c4b2c2c5ad0c670e
Merge branch 'bug-968' into release