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
..
plugins	Merge branch 'ticket/release-v2.0.0/441-journal-touch' into release-v2.0.0	2011-06-10 11:41:52 -07:00