Raphael 2489f8503f Merge branch 'master' into HEAD ... Conflicts: app/controllers/albums_controller.rb app/controllers/aspects_controller.rb app/controllers/photos_controller.rb app/controllers/registrations_controller.rb app/controllers/requests_controller.rb app/helpers/dashboards_helper.rb app/views/albums/show.html.haml app/views/aspects/manage.html.haml app/views/shared/_aspect_nav.haml app/views/shared/_sub_header.haml app/views/status_messages/_status_message.html.haml app/views/status_messages/show.html.haml config/locales/de.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml		2010-09-22 21:32:03 -07:00
..
edit.html.haml	Merge branch 'master' into HEAD	2010-09-22 21:32:03 -07:00