Merge branch 'master' of github.com:diaspora/diaspora into fb

Conflicts: app/views/layouts/application.html.haml app/views/shared/_publisher.haml app/views/shared/_sub_header.haml app/views/users/edit.html.haml config/deploy_config.yml config/routes.rb

Merge branch 'master' of github.com:diaspora/diaspora into fb
08b9aa86 · ilya · f38bcc9e · 8f55852e · 08b9aa86 · 08b9aa86
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
--- a/spec/user_encryption_spec.rb
+++ b/spec/user_encryption_spec.rb
--- a/test/performance/browsing_test.rb
+++ b/test/performance/browsing_test.rb
--- a/test/selenium/login_test.rb
+++ b/test/selenium/login_test.rb
--- a/test/selenium/selenium_suite.rb
+++ b/test/selenium/selenium_suite.rb
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
--- a/ubuntu-setup.bash
+++ b/ubuntu-setup.bash