Merge commit 'origin/next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 16 Sep 2011 17:40:44 +0000 (19:40 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 16 Sep 2011 17:40:44 +0000 (19:40 +0200)
Conflicts:
html/cgi-bin/ovpnmain.cgi


Trivial merge