]> git.ipfire.org Git - thirdparty/openvpn.git/commit
Merge branch 'svn-branch-2.1' into merge
authorDavid Sommerseth <dazo@users.sourceforge.net>
Tue, 26 Apr 2011 21:04:18 +0000 (23:04 +0200)
committerDavid Sommerseth <dazo@users.sourceforge.net>
Tue, 26 Apr 2011 21:04:18 +0000 (23:04 +0200)
commit20b18fd799e2ea9d0651f3ef913dd9ce2e481471
tree86867a1128f35087f37d4b49ecf241b7b8e6b38e
parentc5f7d08b8c3d4287dd40bbdf52525add8f5cee20
parente4359af463463097dd80e679836905bcd8ad7a13
Merge branch 'svn-branch-2.1' into merge

Pulling in changes from James' 2.1/openvpn branch in SVN.

Conflicts:
buffer.c
init.c
manage.h
multi.c
openvpn.8
options.c
ssl.c
version.m4
win/sign.py

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
27 files changed:
Makefile.am
buffer.c
buffer.h
common.h
configure.ac
error.c
forward.c
init.c
manage.c
misc.c
misc.h
multi.c
openvpn.8
openvpn.h
options.c
options.h
proto.h
ps.c
push.c
route.c
service-win32/openvpnserv.c
socket.c
ssl.c
ssl.h
syshead.h
tun.c
win/sign.py