[GNUnet-SVN] [gnunet] 15/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 652e112e5f84ab8558235ee9ab02e663eae7678c
Merge: 7b6f6c01a f88d55e43
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Fri Dec 2 15:14:11 2016 +0100

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

 src/gns/nss/nss_gns.c       |  3 ++-
 src/include/gnunet_common.h | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

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