6c4f1a0f2c67f80405065d2a01b66db5ccd58a6a ce8ba76ed02eb5382cd6d3bf386c6344d3fd7afd Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-more/commit/c2a80cee938de2a879bf5ad81dabd3727f3ff7d2 c2a80cee938de2a879bf5ad81dabd3727f3ff7d2 2008-06-27T04:32:32-07:00 2008-06-27T04:32:32-07:00 Merge branch 'new_merb_gen' into testing Conflicts: .gitignore merb-cache/lib/merb-cache/cache-action.rb merb-freezer/README merb-freezer/Rakefile merb-freezer/bin/frozen-merb merb-freezer/lib/merb-freezer.rb merb-freezer/lib/merb-freezer/merbtasks.rb merb-freezer/spec/merb-freezer_spec.rb merb-freezer/spec/spec_helper.rb 7cdd7d32af4f16d97369c1365d5eb9ad59fe3cb0 Jonas Nicklas jonas.nicklas@gmail.com