Merge remote-tracking branch 'ummeegge/OpenVPN' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 11 May 2014 16:27:50 +0000 (18:27 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 11 May 2014 16:27:50 +0000 (18:27 +0200)

Trivial merge