Merge branch 'fix_social' of gnunet.org:gnunet into fix_social
authort3sserakt <t3ss@posteo.de>
Sun, 29 Oct 2017 01:48:26 +0000 (02:48 +0100)
committert3sserakt <t3ss@posteo.de>
Sun, 29 Oct 2017 01:48:26 +0000 (02:48 +0100)

Trivial merge