transaction search button was huge in IE and Firefox #70237
change hash syntax for 1.8.7 support
Merge branch 'master' into upgrades
Merge branch 'rails_3.1' into upgrades
fixes for oracle

newer versions of awesome_nested_set break on oracle
oracle driver doesn't know that ActiveSupport::SafeBuffer should be
treated as a string
Merge branch 'upgrades' into rails_3.2

Conflicts:
	Gemfile.lock