]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
Merge branch 'master' into bugfix2.1
authorDavid Sommerseth <dazo@users.sourceforge.net>
Sun, 18 Apr 2010 22:11:15 +0000 (00:11 +0200)
committerDavid Sommerseth <dazo@users.sourceforge.net>
Sun, 18 Apr 2010 22:11:15 +0000 (00:11 +0200)

Trivial merge