c43f6c9cb9626e4cec786bf81a53ca1afc9d6a44 281dd17cb2b7a970260b27bbdc5e7d24e7220633 François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/f1068ff008b7da9263fd9037d1a37b3813e70991 f1068ff008b7da9263fd9037d1a37b3813e70991 2008-03-11T12:33:33-07:00 2008-03-11T12:33:33-07:00 Merge branch 'rel-0.8' into multiengine Conflicts: db/schema.rb 4331244d9d66851e681030c5dbe0acb35e91fe9e François Beausoleil francois@teksol.info