Merge commit 'upstream/1.1.4'
authorSven Hoexter <sven@timegate.de>
Wed, 1 Feb 2012 19:42:23 +0000 (20:42 +0100)
committerSven Hoexter <sven@timegate.de>
Wed, 1 Feb 2012 19:42:23 +0000 (20:42 +0100)
commit3137412731c34afbce14633f54a5b395d20d4af2
tree7ab56a9cc4e564c6c3ead4491bd19f3f19228bba
parent34f477538ed4effb03e721c4604fc39f1c276e83
parent441d40ab894e5a2bb80d08221dd693e1170224fc
Merge commit 'upstream/1.1.4'