Michael Tremer 30491c6ac7 Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen ...

Conflicts:
	html/html/themes/ipfire/include/css/style.css

2014-01-11 13:08:27 +01:00

..

cgi-bin

OpenVPN: Check if port is smaller than 1024.

2014-01-11 12:38:53 +01:00

html

Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen

2014-01-11 13:08:27 +01:00