[GNUnet-SVN] [gnunet] 06/171: Merge remote-tracking branch 'origin/master' into credentials

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit 7356e4ff0c881ce1f9eb053d6a8a5866fb2179dc
Merge: 3e22103e0 40dc72771
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Sun Nov 27 18:43:43 2016 +0100

    Merge remote-tracking branch 'origin/master' into credentials

 configure.ac                                     |   2 +-
 doc/man/Makefile.am                              |   1 +
 doc/man/gnunet-nat.1                             |  67 ++++
 po/de.po                                         |  76 ++--
 po/es.po                                         |  76 ++--
 po/fr.po                                         |  76 ++--
 po/sv.po                                         |  76 ++--
 po/vi.po                                         |  76 ++--
 po/zh_CN.po                                      |  76 ++--
 src/conversation/plugin_gnsrecord_conversation.c |   4 +-
 src/include/gnunet_strings_lib.h                 |  25 +-
 src/nat/Makefile.am                              |   2 +-
 src/nat/gnunet-nat.c                             | 470 ++++++++++++++++++++---
 src/util/service_new.c                           |   8 +
 src/util/strings.c                               |  78 +++-
 15 files changed, 833 insertions(+), 280 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
address@hidden