36c7538548f8b511c23a8e75600217edc9fd039b 57d84f2020926f26bebc2090ba51bf01dadc32e2 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/ee43bd5f870bb9ad822bdade58cd970fc088b975 ee43bd5f870bb9ad822bdade58cd970fc088b975 2008-10-12T08:36:59-07:00 2008-10-12T08:36:59-07:00 Resolved conflict, added a note on metaprogramming use in -core. Sometimes it is appropriate. cbd70c68a723d468d72f89ee5efe692d12136dae Michael S. Klishin michael@novemberain.com