From: David Sommerseth <dazo@users.sourceforge.net>
Date: Tue, 27 Apr 2010 21:07:18 +0000 (+0200)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: v2.2-beta1~7^2~6^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d0a688b2f80d6e6afb39500d9ca46c443309b34;p=thirdparty%2Fopenvpn.git

Merge remote branch 'origin/master'
---

3d0a688b2f80d6e6afb39500d9ca46c443309b34