Merge branch 'fix_social' of gnunet.org:gnunet into fix_social
authort3sserakt <t3ss@posteo.de>
Thu, 9 Nov 2017 19:35:41 +0000 (20:35 +0100)
committert3sserakt <t3ss@posteo.de>
Thu, 9 Nov 2017 19:35:41 +0000 (20:35 +0100)

Trivial merge