From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 14 Jul 2014 12:02:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'amarx/openvpn'
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=a78470dc17d2f3bfb563ff58ebec1299f5a408cb

Merge remote-tracking branch 'amarx/openvpn'
---

a78470dc17d2f3bfb563ff58ebec1299f5a408cb