Michael Tremer df6649b0fe Merge remote-tracking branch 'amarx/firewall-dnat' into next ...

Conflicts:
	config/firewall/rules.pl

2014-09-26 12:55:55 +02:00

..

cgi-bin

Merge remote-tracking branch 'amarx/firewall-dnat' into next

2014-09-26 12:55:55 +02:00

html

theme: Fix spacing of version string in footer.

2014-05-10 14:25:36 +02:00