[SCM] GNU gnutls branch, gnutls_3_0_x-2, updated. gnutls_3_0_20-15-g96ad1b0

[Nikos Mavrogiannopoulos]

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 "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=96ad1b01fc2915f7966f166cb0d87cd9e82f271f

The branch, gnutls_3_0_x-2 has been updated
       via  96ad1b01fc2915f7966f166cb0d87cd9e82f271f (commit)
      from  5b15314d535e6fb76d3aa50d7174fd240b52c525 (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 96ad1b01fc2915f7966f166cb0d87cd9e82f271f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Jun 20 20:04:35 2012 +0200

    removed crap

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

Summary of changes:
 NEWS |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/NEWS b/NEWS
index 52b44dd..912550b 100644
--- a/NEWS
+++ b/NEWS
@@ -41,17 +41,6 @@ even on verification failure.
 gnutls_pk_to_sign: Added
 gnutls_pubkey_verify_hash2: Added
 gnutls_certificate_set_x509_system_trust: Added
-<<<<<<< HEAD
-=======
-gnutls_pkcs11_obj_list_import_url2: Added
-gnutls_x509_trust_list_add_system_trust: Added
-gnutls_x509_trust_list_add_trust_file: Added
-gnutls_x509_trust_list_add_trust_mem: Added
-gnutls_pk_to_sign: Added
-gnutls_session_set_premaster: Added
-gnutls_pubkey_verify_hash: Deprecated (use gnutls_pubkey_verify_hash2)
-gnutls_pubkey_verify_data: Deprecated (use gnutls_pubkey_verify_data2)
->>>>>>> fd5ca1a... Added support for an old version of the DTLS protocol
 
 
 * Version 3.0.19 (released 2012-04-22)


hooks/post-receive
-- 
GNU gnutls