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

Merge remote branch 'origin/master'
---

7125534fe28e4bff002e435ed6254b733e20461c