e3ef0ca318ec37f3680779ca94d089792216c2e8 5a8f9e30d2c19cd16dd252c356929ef5173c729c Ruben Gomez rugoli@gmail.com http://github.com/yuki/insoshi/commit/4ac8bdb378ba25a8d71639c63180988324005cc5 4ac8bdb378ba25a8d71639c63180988324005cc5 2008-11-12T02:09:31-08:00 2008-11-12T02:09:31-08:00 Merge commit 'origin/edge' into group_option Conflicts: app/controllers/people_controller.rb app/helpers/activities_helper.rb app/helpers/application_helper.rb app/models/person.rb app/models/photo.rb app/views/people/show.html.erb config/routes.rb public/stylesheets/skin.css diff timed out because it was too large 820bc37f058288d2c6db19a6b7c083f463362f24 Ruben Gomez rugoli@gmail.com