From: David Sommerseth <dazo@users.sourceforge.net>
Date: Tue, 16 Mar 2010 21:35:24 +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
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5affde60199ce7df4edf411ed1fde4c37625a0cc;p=thirdparty%2Fopenvpn.git

Merge remote branch 'origin/master'
---

5affde60199ce7df4edf411ed1fde4c37625a0cc