Merge branch 'next' of git://git.ipfire.org/ipfire-2.x into next

Browse Source

Conflicts:
	html/cgi-bin/vpnmain.cgi

...

This commit is contained in:

Christian Schmidt

2011-08-01 19:08:35 +02:00

parent 2444cc9780 5520be2f21

commit f99f4293e7

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available