projects / oweals / gnunet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4dda2c0 bf6f552)
Merge branch 'master'
authorJulius Bünger <buenger@mytum.de>
Mon, 13 Mar 2017 00:30:27 +0000 (01:30 +0100)
committerJulius Bünger <buenger@mytum.de>
Mon, 13 Mar 2017 00:31:38 +0000 (01:31 +0100)

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