Merge branch 'bug-942' into release
authorMichael Tänzer <neo@nhng.de>
Sun, 20 Nov 2011 00:58:33 +0000 (01:58 +0100)
committerMichael Tänzer <neo@nhng.de>
Sun, 20 Nov 2011 00:58:33 +0000 (01:58 +0100)
commitb681e568fa21c2fcc5c60282797661b2c4ac6aee
tree58d6f5c2de11a37d6abaee16668c3dc6a521f9ee
parent5096005293c808c5bb52208c7ce8c50a6deebadd
parentab33bb3986f2b178c9baab61c5f52dfb7243ac6b
Merge branch 'bug-942' into release