Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Sun, 12 Apr 2015 21:23:40 +0000 (23:23 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sun, 12 Apr 2015 21:23:40 +0000 (23:23 +0200)
1  2 
html/cgi-bin/ovpnmain.cgi

Simple merge