Merge branch 'fix_social' of gnunet.org:gnunet into fix_social
authort3sserakt <t3ss@posteo.de>
Wed, 22 Nov 2017 16:28:24 +0000 (17:28 +0100)
committert3sserakt <t3ss@posteo.de>
Wed, 22 Nov 2017 16:28:24 +0000 (17:28 +0100)

Trivial merge