48a8c1e203e65959fb2f9a84caee45b66213134f 0cffaee546587fd9fa62f9aa63979379adbb9b6c dsutedja dsutedja@helium.com http://github.com/markbates/mack-more/commit/095f59c14a5a248115af24bad6ba76e4151723cb 095f59c14a5a248115af24bad6ba76e4151723cb 2008-07-17T05:36:47-07:00 2008-07-17T05:36:47-07:00 Merge branch 'master' of git@github.com:markbates/mack-more Conflicts: mack-localization/example/lang_test/app/controllers/items_controller.rb 68fe536b94d0169dfd434f19647648593740ce1c dsutedja dsutedja@helium.com