Merge remote-tracking branch 'stevee/ovpnmain.cgi-fixes' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 20 Jul 2013 09:08:56 +0000 (11:08 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 20 Jul 2013 09:08:56 +0000 (11:08 +0200)

Trivial merge