Merge branch 'bug-918' into release 2011-06-15
authorMichael Tänzer <neo@nhng.de>
Wed, 15 Jun 2011 15:08:26 +0000 (17:08 +0200)
committerMichael Tänzer <neo@nhng.de>
Wed, 15 Jun 2011 15:08:26 +0000 (17:08 +0200)
commit5adba778b0e1d1b73555b561a5acfae23e9ba66c
tree63bf62fb9a64608975359a6c07663765133d136c
parent403fb7c3907c337f75c40d306147b339aa6a5d1c
parent7f1f10b52ab565d582de1ddb933872ce12e104f3
Merge branch 'bug-918' into release