Merge branch 'bug-967' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 3 Jul 2012 22:59:27 +0000 (00:59 +0200)
committerMichael Tänzer <neo@nhng.de>
Tue, 3 Jul 2012 22:59:27 +0000 (00:59 +0200)
commitfd4fbe21e9ef63c555469b595f7748fadfb977f4
tree0669f7ffd8c0a26bd47ae8dfd6811b5ea9b3d9dd
parentd4c82b6ef229087fa8ad576430587c6ea1a14d50
parent1e98bc7a794467ef437f17b826cecd5ccb9fe6d2
Merge branch 'bug-967' into release