Merge remote-tracking branch 'ummeegge/openvpn' into beyond-next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 11 Mar 2014 13:19:14 +0000 (14:19 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 11 Mar 2014 13:19:14 +0000 (14:19 +0100)

Trivial merge