Merge remote-tracking branch 'amarx/openvpn'
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 14 Jul 2014 12:02:57 +0000 (14:02 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 14 Jul 2014 12:02:57 +0000 (14:02 +0200)

Trivial merge