[GNUnet-SVN] [gnunet] 13/15: Merge branch 'master' of ssh://gnunet.org/gnunet

[gnunet]

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

xrs pushed a commit to branch master
in repository gnunet.

commit acfd78293352b5cdd640023343db3578fdceea94
Merge: 990c536e0 51e9f26b1
Author: xrs <address@hidden>
AuthorDate: Wed Apr 12 20:20:51 2017 +0200

    Merge branch 'master' of ssh://gnunet.org/gnunet

 po/POTFILES.in                                 |    5 +-
 po/de.po                                       | 3078 ++++++++++++-----------
 po/es.po                                       | 3165 ++++++++++++------------
 po/fr.po                                       | 3030 +++++++++++------------
 po/sv.po                                       | 3120 ++++++++++++-----------
 po/vi.po                                       | 3129 ++++++++++++-----------
 po/zh_CN.po                                    | 2982 +++++++++++-----------
 src/ats-tests/Makefile.am                      |    3 +-
 src/cadet/cadet_api.c                          |   16 +-
 src/conversation/gnunet-service-conversation.c |    8 +
 src/fs/fs_unindex.c                            |   14 +-
 src/include/gnunet_cadet_service.h             |    2 +-
 src/include/gnunet_disk_lib.h                  |    3 +-
 src/namestore/Makefile.am                      |    1 -
 src/secretsharing/Makefile.am                  |    3 +-
 src/testbed/Makefile.am                        |    1 -
 src/util/strings.c                             |    1 +
 17 files changed, 9156 insertions(+), 9405 deletions(-)

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