Merge branch 'master' of ssh://git.ccc-ffm.de/memberdb
authorAndreas Schiermeier <andreas@schiermeier.name>
Mon, 12 Oct 2015 21:06:06 +0000 (23:06 +0200)
committerAndreas Schiermeier <andreas@schiermeier.name>
Mon, 12 Oct 2015 21:06:06 +0000 (23:06 +0200)
1  2 
include/members.php

Simple merge