Merge from upstream
Merge from origin
Merge from origin
Merge from upstream
Merge from upstream
site language was left out of siteinfo
ability to pre-populate connections for new channels. e.g. "MySpace Tom"
only auto-follow the site recommendations if creating the first channel for an account.
Rebase from upstream
Merge from master
issues with diaspora comment signatures on relayed comments that are relayed through a redmatrix site (parent post is redmatrix) and involve a private post.
query for statistics are now executed by poller
Merge pull request #610 from tuscanhobbit/dev

site language wasn't included in siteinfo/json
more work on photos
Merge remote-tracking branch 'upstream/master'