Merge branch 'master' of github.com:annando/friendica
authorMichael <heluecht@pirati.ca>
Mon, 13 Mar 2017 10:21:35 +0000 (10:21 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 13 Mar 2017 10:21:35 +0000 (10:21 +0000)

Trivial merge