Merge branch 'bug-1141' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 27 Feb 2013 00:46:14 +0000 (01:46 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 27 Feb 2013 00:46:14 +0000 (01:46 +0100)
commitdecb5f5b2c60dd19268bc901e15300d10a5ab81e
tree2c8626ee3ae57f6fe53cfabe540f6656cddf67ec
parenta179527ab6174bf81346af5640cab11d9f245966
parent9769049b3764c7744a296ac0a0b3381916b30749
Merge branch 'bug-1141' into release