]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
Merge branch 'patchqueue' into bugfix2.1
authorDavid Sommerseth <dazo@users.sourceforge.net>
Tue, 27 Apr 2010 21:29:21 +0000 (23:29 +0200)
committerDavid Sommerseth <dazo@users.sourceforge.net>
Tue, 27 Apr 2010 21:29:21 +0000 (23:29 +0200)
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
1  2 
openvpn.8
ssl.c

diff --cc openvpn.8
Simple merge
diff --cc ssl.c
Simple merge