0c628dc7e2ff8b7529f43e4090d37adc8e86ba54 24bfceaae2b1edf7c2f92fb9a7716a523ba7f417 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/f2712773d0f8beed1be8ec97fcd39a27f6ff4159 f2712773d0f8beed1be8ec97fcd39a27f6ff4159 2008-12-20T08:04:57-08:00 2008-12-20T08:04:57-08:00 Merge branch 'master' into new-plugins Conflicts: lib/mephisto/plugin.rb 1e506c6f381b3ba951c3c9b76de90aeccf33aad0 Eric Kidd git@randomhacks.net