projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f64bd0c 542de3e)
Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorChristian Grothoff <christian@grothoff.org>
Tue, 7 Mar 2017 22:44:57 +0000 (23:44 +0100)
committerChristian Grothoff <christian@grothoff.org>
Tue, 7 Mar 2017 22:44:57 +0000 (23:44 +0100)

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