[glib-networking/tls-database: 5/5] Merge branch 'master' into tls-database

[Stefan Walter <stefw src gnome org>]

commit 365f32552aecdf768f6826ebb51f39493edb7f44
Merge: a0281f4 a16a48a
Author: Stef Walter <stefw collabora co uk>
Date:   Mon Jan 17 10:24:34 2011 -0800

    Merge branch 'master' into tls-database

 NEWS                                     |    9 +++
 configure.ac                             |    4 +-
 po/LINGUAS                               |    1 +
 po/id.po                                 |   94 ++++++++++++++++++++++++++++++
 tls/gnutls/gtlscertificate-gnutls.c      |    2 +
 tls/gnutls/gtlsclientconnection-gnutls.c |   38 ++++++++-----
 6 files changed, 132 insertions(+), 16 deletions(-)
---