Merge branch 'bug-1099' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 16 Apr 2013 16:36:49 +0000 (18:36 +0200)
committerMichael Tänzer <neo@nhng.de>
Tue, 16 Apr 2013 16:36:49 +0000 (18:36 +0200)

Trivial merge