Merge branch 'fix_social' of gnunet.org:gnunet into fix_social
authort3sserakt <t3ss@posteo.de>
Fri, 24 Nov 2017 20:58:53 +0000 (21:58 +0100)
committert3sserakt <t3ss@posteo.de>
Fri, 24 Nov 2017 20:58:53 +0000 (21:58 +0100)

Trivial merge