Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
authorHypolite Petovan <mrpetovan@gmail.com>
Tue, 28 Mar 2017 07:12:53 +0000 (03:12 -0400)
committerHypolite Petovan <mrpetovan@gmail.com>
Tue, 28 Mar 2017 07:12:53 +0000 (03:12 -0400)

Trivial merge