[Openvpn-commits] SF.net Git: OpenVPN with experimental and new features - which requires a lot of testing branch, beta2.2, updated. 4b519cf51d02daacb388eb90bd0c5930145d7a0d

[<ope...@li...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenVPN with experimental and new features - which requires a lot of testing".

The branch, beta2.2 has been updated
       via  4b519cf51d02daacb388eb90bd0c5930145d7a0d (commit)
       via  423d68b0ede7f10c02fa753cba8d60d2218d2dc7 (commit)
       via  3adf2f558e157ef5087ca44f13e097a394ef7c78 (commit)
      from  513a53284158c6fe3b4c89b59eb10029639407b5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4b519cf51d02daacb388eb90bd0c5930145d7a0d
Merge: 513a53284158c6fe3b4c89b59eb10029639407b5 423d68b0ede7f10c02fa753cba8d60d2218d2dc7
Author: David Sommerseth <da...@us...>
Date:   Sun Nov 14 23:48:49 2010 +0100

    Merge branch 'bugfix2.1' into beta2.2
    
    Conflicts:
    	options.c
    	- Disagreements about a new included file (forward.h)
    
    Signed-off-by: David Sommerseth <da...@us...>

-----------------------------------------------------------------------

Summary of changes:
 base64.c                             |    6 +-----
 contrib/pull-resolv-conf/client.down |    5 +++--
 contrib/pull-resolv-conf/client.up   |    5 +++--
 options.c                            |    1 +
 4 files changed, 8 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
OpenVPN with experimental and new features - which requires a lot of testing