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)
commit83803caf386c3a7fd55215ecad348131be56bba6
tree0beb8855f04e3732d6c4593922c11c1b832d77ac
parent6666897c5c4f6e328e56e66e53750a906ef04ee6
parentc125d8a2b4770e3cd63ef18ae720dd6e5fb8576c
Merge remote-tracking branch 'stevee/ovpnmain.cgi-fixes' into next