From: Michael Tremer Date: Mon, 8 Dec 2014 18:12:48 +0000 (+0100) Subject: Merge remote-tracking branch 'ummeegge/OpenVPN_additional_configs' into next X-Git-Tag: v2.17-core89~83^2~12 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=18f2b3d171c4b03a8801fcc595e2907aa0352a4e Merge remote-tracking branch 'ummeegge/OpenVPN_additional_configs' into next --- 18f2b3d171c4b03a8801fcc595e2907aa0352a4e