projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8a5c586 1664918)
Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorChristian Grothoff <christian@grothoff.org>
Wed, 30 Nov 2016 20:13:13 +0000 (21:13 +0100)
committerChristian Grothoff <christian@grothoff.org>
Wed, 30 Nov 2016 20:13:44 +0000 (21:13 +0100)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.