From: Christian Schmidt <maniacikarus@ipfire.org>
Date: Mon, 1 Aug 2011 17:08:35 +0000 (+0200)
Subject: Merge branch 'next' of git://git.ipfire.org/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=f99f4293e7ccb913105be165ddf25ea90bf676d4;hp=-c

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

Conflicts:
	html/cgi-bin/vpnmain.cgi
---

f99f4293e7ccb913105be165ddf25ea90bf676d4