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)
commit3932f02ba33e0f0b7686db4bd6f4609ae7e3d370
tree72dbd42ce3c897943c718d820dfbf7ec355816f5
parent9efba5f773a19b0b402bd7b4454d911f304e7d3b
parent9063a04e94587fc38f410ec2234275417de201ad
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen-layout
html/cgi-bin/ovpnmain.cgi