suppress creating the directory update record for profile updates which are part of the normal import_xchan sequence - otherwise we get two for every change. Create it normally if we are called with a profile_update message and don't go through the whole import_xchan thing.
Typo
Merge pull request #155 from oohlaf/fixes

Explain why public comments are disabled and what needs to happen to enable them.
structure for channel unions
Merge https://github.com/friendica/red into zpull
Minor theme stuff - make the pages toolbar a toolbar, get rid of a naughty center tag, and stop very long tags overlapping the directory.
Merge branch 'master' of https://github.com/friendica/red
Issue #131
Typo
Actually, lets add a content wrapper while we're in there.
aggregate channels
Merge https://github.com/friendica/red into zpull
convert to plaintext before matching words in body. Otherwise every post I make with a link in it is going to match a test for zot.
Add colorpicker jquery plugin for themes
Merge pull request #157 from 0xAF/master

Add colorpicker jquery plugin for themes
doc updates
string update
fix can_comment_on_post when viewing wall-to-wall
Merge https://github.com/friendica/red into zpull
close comment