Merge remote-tracking branch 'origin/merge_button'

Conflicts:
	app/assets/javascripts/merge_requests.js
	db/schema.rb

db/migrate/20120329170745_add_automerge_to_merge_request.rb

@@ -0,0 +1,5 @@
+class AddAutomergeToMergeRequest < ActiveRecord::Migration
+  def change
+    add_column :merge_requests, :state, :integer, :null => false, :default => 1
+  end
+end