merge svn from https://kdserv.dyndns.org/svn/freifunk-icvpn