projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cef53c8 13b340c)
Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorBart Polot <bart.polot+gnunet@gmail.com>
Wed, 1 Mar 2017 17:49:52 +0000 (18:49 +0100)
committerBart Polot <bart.polot+gnunet@gmail.com>
Wed, 1 Mar 2017 17:49:52 +0000 (18:49 +0100)

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