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)
commitd295085b202f225a24070f3605fdbaa6c359b0ce
tree66fe0b2244e2542500296a80e643682ec4241eb9
parent58bdf75647ceaf53947a97bf3bc05f7e44c74150
parent18a3bd27ba18b4568e0b590d62f8480a9cd7d621
Merge git.ccc-ffm.de:memberdb