Merge remote-tracking branch 'amarx/BETA3' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 13 Mar 2014 14:32:00 +0000 (15:32 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 13 Mar 2014 14:32:00 +0000 (15:32 +0100)
1  2 
html/cgi-bin/vpnmain.cgi
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl

Simple merge
Simple merge
Simple merge