[GNUnet-SVN] [gnunet] 05/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 3e22103e0cecfeb8a03e65733fd0ab5c475a302b
Merge: fad73f243 0fa8cc7c2
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Mon Nov 21 20:47:10 2016 +0100

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

 po/de.po                | 24 ++++++++++++++----------
 po/es.po                | 28 ++++++++++++++--------------
 po/fr.po                | 18 +++++++++---------
 po/sv.po                | 28 ++++++++++++++--------------
 po/vi.po                | 28 ++++++++++++++--------------
 po/zh_CN.po             | 28 ++++++++++++++--------------
 src/postgres/postgres.c |  3 ++-
 7 files changed, 81 insertions(+), 76 deletions(-)

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