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)

Trivial merge