0ee488dc7d49125394c853f950263513263fb88a d32c0c6a97cc93a0649488f071f7e6bc287da723 dsutedja dsutedja@helium.com http://github.com/markbates/mack/commit/6455ed89edd2f9179f0fb0e806901ad82af474c3 6455ed89edd2f9179f0fb0e806901ad82af474c3 2008-07-22T07:31:33-07:00 2008-07-22T07:31:33-07:00 Merge branch 'master' of git@github.com:markbates/mack Conflicts: CHANGELOG 9964e2749d57526a3680da616d85706b3ce52de3 dsutedja dsutedja@helium.com