[GNUnet-SVN] [gnunet] 79/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 ad5b64d8ef992d7281501297b547095569d8f0fb
Merge: 574725747 b612bb0db
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Tue May 30 13:50:19 2017 +0200

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

 guix-env.scm | 52 +++++++++-------------------------------------------
 1 file changed, 9 insertions(+), 43 deletions(-)

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