[GNUnet-SVN] [gnunet] 04/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 254362f9b8511629cecd433ee260ff3d1e156c28
Merge: 02babcf34 48510e67c
Author: xrs <address@hidden>
AuthorDate: Sun Mar 12 17:04:32 2017 +0100

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

 src/cadet/cadet_test_lib.c | 2 +-
 src/sq/Makefile.am         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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