Merge branch 'master' of https://gnunet.org/git/gnunet
authorlurchi <lurchi@strangeplace.net>
Wed, 27 Jun 2018 23:29:14 +0000 (01:29 +0200)
committerlurchi <lurchi@strangeplace.net>
Wed, 27 Jun 2018 23:32:10 +0000 (01:32 +0200)
commit7540ebcd02d9bfe0a690689a1f57952eda5b5c81
tree4f7444bb5e86adb40dfb2003bc6ba0242f5ec587
parentfbf7f994ac4a5a509857c9bd267909d1cffc600c
parentb5b8184a326352877d97be10ef3812dd760e5d2f
Merge branch 'master' of https://gnunet.org/git/gnunet
doc/documentation/gnunet.texi