f2712773d0f8beed1be8ec97fcd39a27f6ff4159 4f4e5a77b043d9626507548acd65ac6fe1839aa4 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/adaba9bc598e822903ed8c51280061933d5aad7a adaba9bc598e822903ed8c51280061933d5aad7a 2008-12-20T19:02:25-08:00 2008-12-20T19:02:25-08:00 Merge branch 'master' into new-plugins 45d62477c4e49e5547b5ab84bc39b303bb586eca Eric Kidd git@randomhacks.net