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

Merge remote branch 'origin/master' with SVN
---

3489a3f967143b8ed91803de57a66830e392162c