Mike Gaffney 0c9944c4d8 Merge commit 'eddd97936' ... Conflicts: spec/integration/rails/test/integration/webrat_test.rb		2009-06-15 22:40:02 -05:00
..
controllers	Merge commit 'eddd97936'	2009-06-15 22:40:02 -05:00
helpers	[#257 state:awaiting-patch] here is a test proving the issue	2009-06-02 17:23:12 -05:00
views	[#261 state:awaiting-patch]	2009-06-08 12:08:53 -05:00