Merge remote-tracking branch 'ummeegge/openvpn'
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 12 Jun 2014 14:26:55 +0000 (16:26 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 12 Jun 2014 14:26:55 +0000 (16:26 +0200)
1  2 
langs/en/cgi-bin/en.pl

Simple merge