Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
authorHypolite Petovan <ben.lort@gmail.com>
Fri, 10 Mar 2017 02:11:14 +0000 (21:11 -0500)
committerHypolite Petovan <ben.lort@gmail.com>
Fri, 10 Mar 2017 02:11:14 +0000 (21:11 -0500)

Trivial merge