From: David Sommerseth <dazo@users.sourceforge.net>
Date: Tue, 9 Mar 2010 11:13:42 +0000 (+0100)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: v2.2-beta1~7^2~6^2~22^2~1^2^2^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6f80c0d149fcee4c9a2683ee04ab1628cf117ee;p=thirdparty%2Fopenvpn.git

Merge remote branch 'origin/master'
---

f6f80c0d149fcee4c9a2683ee04ab1628cf117ee