afc291cd9d5c660c4071741b21e79a3df62223f2 b7e9fc3e9f08c7970d1b6d69928e832511c7f2fe Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/9440e521e1dbc6bc45dfc06b136a69edbfc677bc 9440e521e1dbc6bc45dfc06b136a69edbfc677bc 2008-09-27T18:29:32-07:00 2008-09-27T18:29:32-07:00 Merge branch 'forking_bootloader' of git@github.com:wycats/merb-core into forking_bootloader Fixed Conflicts: lib/merb-core.rb lib/merb-core/bootloader.rb lib/merb-core/server.rb b704dedef637f28bcd51927f6c442bcd1896f3e2 Yehuda Katz wycats@gmail.com