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)
commita78470dc17d2f3bfb563ff58ebec1299f5a408cb
treec6fa9bb83efe20e3ac0b930824a7b81e57f60324
parentff5e4ef87194735870012f73ff998a7b4d8da4a9
parent5b942f7f3b3fd5277ca990c22530ea5f0aa33876
Merge remote-tracking branch 'amarx/openvpn'