Merge branch 'master' of ssh://git.sven.stormbind.net/home/sven/www/sven_htdocs/git...
authorSven Hoexter <sven@timegate.de>
Sat, 14 Jan 2012 17:06:00 +0000 (18:06 +0100)
committerSven Hoexter <sven@timegate.de>
Sat, 14 Jan 2012 17:06:00 +0000 (18:06 +0100)

Trivial merge