projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 016df6e 164e974)
Merge branch 'master' of git+ssh://gnunet.org/gnunet
authorBart Polot <bart.polot+voyager@gmail.com>
Fri, 27 Jan 2017 13:53:21 +0000 (14:53 +0100)
committerBart Polot <bart.polot+voyager@gmail.com>
Fri, 27 Jan 2017 13:53:21 +0000 (14:53 +0100)

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