Merged 17073:17076 from trunk.

author Tom Hughes <tom@compton.nu>

Tue, 13 Oct 2009 20:25:11 +0000 (20:25 +0000)

committer Tom Hughes <tom@compton.nu>

Tue, 13 Oct 2009 20:25:11 +0000 (20:25 +0000)
author Tom Hughes <tom@compton.nu>
Tue, 13 Oct 2009 20:25:11 +0000 (20:25 +0000)
committer Tom Hughes <tom@compton.nu>
Tue, 13 Oct 2009 20:25:11 +0000 (20:25 +0000)
diff --cc test/functional/changeset_controller_test.rb
Simple merge
author	Tom Hughes <tom@compton.nu>
	Tue, 13 Oct 2009 20:25:11 +0000 (20:25 +0000)
committer	Tom Hughes <tom@compton.nu>
	Tue, 13 Oct 2009 20:25:11 +0000 (20:25 +0000)