Merge remote-tracking branch 'tootsuite/master' into merge-upstream

Conflicts:
 	app/models/status.rb

The conflict in the Status model was due to
5bf5003384.
It was resolved by accepting tootsuite's changes.

app/views/admin/accounts/_account.html.haml

@@ -1,7 +1,7 @@
 %tr
   %td.username
     = account.username
-  %td.domain
+  %td
     - unless account.local?
       = link_to account.domain, admin_accounts_path(by_domain: account.domain)
   %td