14c1c108592a8b85fab60993ceba1ac96d9865c7 154a3bee6dee49d18688049c6a8e4b460d04a26d c3 courtenay@entp.com http://github.com/entp/xtt/commit/9f7769baf66fddb2dcdfb30f51badfe9e539e744 9f7769baf66fddb2dcdfb30f51badfe9e539e744 2009-06-11T10:48:35-07:00 2009-06-11T10:48:35-07:00 Merge branch 'entp_master' Conflicts: db/schema.rb spec/controllers/projects_controller_spec.rb vendor/plugins/aasm/lib/persistence/active_record_persistence.rb 6ec0d48ab1517c702d7fb2c0b0ccbcecb7a1abe2 c3 courtenay@entp.com