Merge branch 'master' of git.sven.stormbind.net:/home/sven/www/sven_htdocs/git/pflogsumm
authorSven Hoexter <sven@timegate.de>
Wed, 1 Feb 2012 19:43:00 +0000 (20:43 +0100)
committerSven Hoexter <sven@timegate.de>
Wed, 1 Feb 2012 19:43:00 +0000 (20:43 +0100)

Trivial merge