Merge branch 'bug-1023' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 30 May 2012 19:56:34 +0000 (21:56 +0200)
committerMichael Tänzer <neo@nhng.de>
Wed, 30 May 2012 19:56:34 +0000 (21:56 +0200)
commit83841a905be04357a065d929a59a9fa314f36415
tree244176106445dc7fd49c7958cbb09690c3525a15
parent3aacc6db438b98a515ce6f4ed42c68e4d06f63ea
parent425628a5ce78df099f203851a274adbf026f62ab
Merge branch 'bug-1023' into release