Merge pull request #4 from friendica/master

Fast forward local hub
Merge pull request #6 from tuscanhobbit/master

Fast forward local hub
Merge from origin
Merge from master
one more hidden config
Merge pull request #637 from tuscanhobbit/dev

one more hidden config option
When you delete something in /cloud stay in the right folder.

When you deleted a file in /cloud you was always jumped back to /cloud/[channel],
now you will stay in the parent folder.
Some more doxygen documentation.
Removed duplicate data from logging output and reduced logging in RedDAV in general.
new function hubloc_change_primary()
Merge https://github.com/friendica/red into pending_merge
Merge pull request #638 from dawnbreak/RedDAV

When you delete something in /cloud stay in the right folder.
sql
Merge https://github.com/friendica/red into pending_merge
this bug has been there for a *long* time. First time I've ever seen it triggered.
more diagnostic when changing primary
there's the problem
don't use cached data
fix import sql error
figuring out how to bootstrap the change_primary procedure when all you have is inconsistent data which you think you trust.
if a hubloc primary change results in an xchan primary change, create a directory update packet.
this is the reason Diaspora forum tagging was broken