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)
commit7e7788ea0bf73e122b71f56e972565d910a1e302
tree0ee7a77096addb9cd1fa8763eb7cc50fdce017da
parent9d870c49eb75331f75bd84daeb6bed658d8a1b90
parent03b08c08f0be261f47335ebf6e608b4b5d6d153a
Merge remote-tracking branch 'amarx/BETA3' into next
html/cgi-bin/vpnmain.cgi
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl