Merge git.ccc-ffm.de:memberdb
authorPascal Hofmann <mail@pascalhofmann.de>
Mon, 31 Oct 2011 13:22:37 +0000 (14:22 +0100)
committerPascal Hofmann <mail@pascalhofmann.de>
Mon, 31 Oct 2011 13:22:37 +0000 (14:22 +0100)

Trivial merge