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

Merge remote branch 'origin/master'
---

0a314a98a7e5639e8063d6485759075358e47f8e