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)
commit509d6c572633e475520f2ab4ba5da36a026678ec
tree65ac62923b95fd49c2b4baea8c225954eed1be55
parentc0c9df130fbb3c5080755822d227277627605196
parentcd0c0a0de72e975c87426642d09897aaf3d293e9
Merge commit 'origin/next'

Conflicts:
html/cgi-bin/ovpnmain.cgi