Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen-layout
authorAlexander Marx <amarx@ipfire.org>
Thu, 9 Jan 2014 15:23:39 +0000 (16:23 +0100)
committerAlexander Marx <amarx@ipfire.org>
Thu, 9 Jan 2014 15:23:39 +0000 (16:23 +0100)
1  2 
html/cgi-bin/ovpnmain.cgi

Simple merge