Consistent syntax for X-Forwarded-Proto
Try adding launchy as a gem - webrat seems to have a dependency on it.
Latest translations from Transifex.
Cleanup whitespace.
New strings for translation.
Downgrade launchy to avoid deprecation warning.
Fix bad merge of d88b79d1aa24a78ed95255a37a0403d7e3c0117e
Pull more up-to-date version of webrat from git - trying to resolve travis issues with launchy dependency.
And now latest version of launchy.
Update to specific commit in webrat for launchy fix without other breaking changes.
Move Gemfile to https
bundle update debugger rmagick
Deal with further side effects of stuff done outside of a transaction in tests
Remove test of rails internals that is somehow interfering with other tests
Now randomise the test order by default to help uncover order dependent issues
Merge branch 'develop' into rails-3-develop

Conflicts:
	Gemfile
	Gemfile.lock
	doc/INSTALL.md