[Openvpn-commits] SF.net Git: OpenVPN with experimental and new features - which requires a lot of testing branch, allmerged, updated. 3aae9991835867fa3bf95e38042615926c359354

[<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, allmerged has been updated
       via  3aae9991835867fa3bf95e38042615926c359354 (commit)
       via  423d68b0ede7f10c02fa753cba8d60d2218d2dc7 (commit)
       via  3adf2f558e157ef5087ca44f13e097a394ef7c78 (commit)
      from  c4e07d47251d5a2965918dd8337de9a57a083afa (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 3aae9991835867fa3bf95e38042615926c359354
Merge: c4e07d47251d5a2965918dd8337de9a57a083afa 423d68b0ede7f10c02fa753cba8d60d2218d2dc7
Author: David Sommerseth <da...@us...>
Date:   Sun Nov 14 23:47:38 2010 +0100

    Merge branch 'bugfix2.1' into allmerged
    
    Conflicts:
    	options.c
    	- Disagreements about a new include 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