]> git.ipfire.org Git - thirdparty/openvpn.git/commit
Merge branch 'svn-BETA21' into beta2.2
authorDavid Sommerseth <dazo@users.sourceforge.net>
Fri, 12 Nov 2010 23:48:28 +0000 (00:48 +0100)
committerDavid Sommerseth <dazo@users.sourceforge.net>
Fri, 12 Nov 2010 23:48:28 +0000 (00:48 +0100)
commit8367889e8467ce73b051aa8db64b0336aea8ed4b
tree99578b1e6969d7eeb19b2578137c1c92de2fc49b
parent0bb41e58782ae9834a61491c5964bc9816b76bc8
parent20a4c12783144d798c6b7446bae8920fdfea7adc
Merge branch 'svn-BETA21' into beta2.2

Conflicts:
version.m4
- Reset version.m4 to a more neutral version number

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
misc.c
misc.h
push.c
ssl.c
ssl.h
syshead.h
version.m4