Merge remote-tracking branch 'amarx/vpn-statistic1' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 13 Jan 2015 16:37:18 +0000 (17:37 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 13 Jan 2015 16:37:18 +0000 (17:37 +0100)
commit3906cf7e852872556728191a234152acf213db05
tree138a04c23d70218bc5eaf01af7b2b4db75b114db
parente62b6718b919e7b5072ebf11294ae7d3adc9560e
parent87fe47e9d9502276284340475e9c5208ae406571
Merge remote-tracking branch 'amarx/vpn-statistic1' into next
html/cgi-bin/firewall.cgi
html/cgi-bin/ovpnmain.cgi
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
lfs/openvpn