Merge branch 'master' of https://github.com/Hypolite/friendica-addons
authorHypolite Petovan <mrpetovan@gmail.com>
Thu, 8 Jun 2017 23:49:16 +0000 (19:49 -0400)
committerHypolite Petovan <mrpetovan@gmail.com>
Thu, 8 Jun 2017 23:49:16 +0000 (19:49 -0400)

Trivial merge