Merge branch 'bug-946' into release 2011-06-08
authorMichael Tänzer <neo@nhng.de>
Wed, 15 Jun 2011 14:56:31 +0000 (16:56 +0200)
committerMichael Tänzer <neo@nhng.de>
Wed, 15 Jun 2011 14:56:31 +0000 (16:56 +0200)
commit403fb7c3907c337f75c40d306147b339aa6a5d1c
tree49cb6b34154d396e8e29f22aca02acd713d4d7f8
parent2feefd5e291c615efb49544734ac1451e573ed66
parent9b225158408e0dd011cf4b0ff69c55e9b6064f59
Merge branch 'bug-946' into release