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

ci.sh

+#!/bin/bash
+
+echo "*************************************************************************************************" &&
+echo "*                                  ruby 1.8.7-p249 build                                        *" &&
+echo "*************************************************************************************************" &&
+echo "" &&
+source /usr/local/rvm/scripts/rvm &&
+rvm use ruby-1.8.7-p249 &&
+bundle install &&
+bundle exec rake ci &&
+echo "" &&
+echo "*************************************************************************************************" &&
+echo "*                                   ruby 1.9.2-p0 build                                         *" &&
+echo "*************************************************************************************************" &&
+echo "" &&
+source /usr/local/rvm/scripts/rvm &&
+rvm use ruby-1.9.2-p0 &&
+bundle install &&
+bundle exec rake ci &&
+rm Gemfile.lock
\ No newline at end of file