Eric Davis ee9b129382 Merge branch 'ticket/release-v2.0.0/441-journal-touch' into release-v2.0.0 ... Conflicts: test/unit/journal_test.rb		2011-06-10 11:41:52 -07:00
..
exemplars	[#436] Remove trailing whitespace	2011-05-30 20:52:25 +02:00
fixtures	[#443] Fix failing tests on 1.9.2 due to an invalid fixture	2011-06-03 09:55:44 -07:00
functional	Remove duplicated test	2011-06-03 09:15:46 -07:00
integration	[#436] Remove trailing whitespace	2011-05-30 20:52:25 +02:00
mocks	[#436] Remove trailing whitespace	2011-05-30 20:52:25 +02:00
unit	Merge branch 'ticket/release-v2.0.0/441-journal-touch' into release-v2.0.0	2011-06-10 11:41:52 -07:00
helper_testcase.rb	[#436] Remove trailing whitespace	2011-05-30 20:52:25 +02:00
object_daddy_helpers.rb	[#436] Remove trailing whitespace	2011-05-30 20:52:25 +02:00
test_helper.rb	[#436] Remove trailing whitespace	2011-05-30 20:52:25 +02:00