From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 16 Sep 2011 17:40:44 +0000 (+0200)
Subject: Merge commit 'origin/next'
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=509d6c572633e475520f2ab4ba5da36a026678ec

Merge commit 'origin/next'

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

509d6c572633e475520f2ab4ba5da36a026678ec