Merge branch 'master' of aymargeddon.de:/var/cache/git/aymargeddon/current
authorBenni Bärmann <benni@obda.de>
Sat, 22 Sep 2012 12:00:26 +0000 (14:00 +0200)
committerBenni Bärmann <benni@obda.de>
Sat, 22 Sep 2012 12:00:26 +0000 (14:00 +0200)

Trivial merge