Merge remote-tracking branch 'alfh/feature_htmlcleanup' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 17 Feb 2014 15:33:38 +0000 (16:33 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 17 Feb 2014 15:33:38 +0000 (16:33 +0100)
commit5ee7500e597d88199b82195f1301712f9179466b
tree844c9a427d6a817cc6256ad7543a3591c381c160
parent6d3c8250fe1e6ef297d01bcc7a19672adfff70e6
parent631b67b7cd4c5fa00417cbe9e843892cae6f0ff6
Merge remote-tracking branch 'alfh/feature_htmlcleanup' into next

Conflicts:
html/cgi-bin/logs.cgi/firewalllogip.dat
html/cgi-bin/logs.cgi/firewalllogport.dat
html/cgi-bin/media.cgi
html/cgi-bin/logs.cgi/firewalllogip.dat
html/cgi-bin/logs.cgi/firewalllogport.dat
html/cgi-bin/media.cgi
html/cgi-bin/ovpnmain.cgi