Merge branch 'bug-1003' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 28 Mar 2012 19:54:02 +0000 (21:54 +0200)
committerMichael Tänzer <neo@nhng.de>
Wed, 28 Mar 2012 19:54:02 +0000 (21:54 +0200)
commitb9d60cb4824796dc85d60e672d076ae25e534682
tree8573ae8e705602e5bb844f9cdfb34e9010e5d0d9
parent01c885f8fc88cd42c750890b9accf67adfbeee40
parentbbdf9a0251c0de0564b7003f706d10996059b0a8
Merge branch 'bug-1003' into release