Merge branch 'master' of https://github.com/friendica/friendica
Merge branch 'master' of https://github.com/friendica/friendica
Merge branch 'master' of https://github.com/friendica/friendica
Merge branch 'master' of https://github.com/friendica/friendica
Merge branch 'master' of https://github.com/friendica/friendica
make sure conv_as->items is an array or don't proceed
Merge pull request #625 from tobiasd/master

make sure conv_as->items is an array or don't proceed