diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2010-07-22 22:30:27 +0200 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-07-22 22:30:27 +0200 |
| commit | c70135d8ed31d133f2fb085bee01db8ad26d7fec (patch) | |
| tree | 6b1edab6b87bd4c0d5b4aeca747232e524d28b36 /.mailmap | |
| parent | Added win/build_exe.py script, which is similar to (diff) | |
| parent | Fixed client hang when server don't PUSH (aka the NO_SOUP_FOR_YOU patch) (diff) | |
| download | openvpn-c70135d8ed31d133f2fb085bee01db8ad26d7fec.tar.xz | |
Merge branch 'bugfix2.1' into beta2.2
Conflicts:
openvpn.8
- New option descriped (--register-dns)
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to '')
| -rw-r--r-- | .mailmap | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..91ff553 --- /dev/null +++ b/.mailmap @@ -0,0 +1 @@ +James Yonan <james@openvpn.net> james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> |