ef85c54ce3ef9c2dfc65c363d34cf9d04ee00365 fe067355f37b727aecad12a67ff83683a9029bb1 bborn bruno.bornsztein@gmail.com http://github.com/bborn/communityengine/commit/fb5094f2a72be9d9d5c5b1f17487a0e9e672f1c9 fb5094f2a72be9d9d5c5b1f17487a0e9e672f1c9 2009-07-09T19:32:43-07:00 2009-07-09T19:32:43-07:00 Merge branch 'master' of git://github.com/juafrlo/communityengine into juafrlo/master Conflicts: CHANGELOG about.yml app/views/events/edit.html.haml app/views/events/new.html.haml app/views/photos/index.html.haml app/views/photos/new.html.haml app/views/photos/show.html.haml app/views/shared/_box.html.haml test/functional/messages_controller_test.rb c6bac1aa200c7d5518e2e6a3fb2d791cf68c1bab bborn bruno.bornsztein@gmail.com