Merge commit 'upstream/1.1.5'
authorSven Hoexter <sven@timegate.de>
Mon, 6 Feb 2012 09:11:16 +0000 (10:11 +0100)
committerSven Hoexter <sven@timegate.de>
Mon, 6 Feb 2012 09:11:16 +0000 (10:11 +0100)
commitaf20e230d9f12ab0effd62cb634016038aa12e9d
tree9d4b40dccfba15d9c85b9b515dbd926cc3e43787
parentc1d5b21cf044394738c99d66a57a4e1332f12650
parentaf381ee9bbd7da425733a2d3f8353f58b13c09cf
Merge commit 'upstream/1.1.5'