gistfile1.txt

$ git branch
* diagnostic
  elr-view
  master
  patch-event-list
$ git add .
$ git commit 
Created commit 0b56606: Fixes issues regarding autocompletes and failed validation.
 8 files changed, 21 insertions(+), 9 deletions(-)
$ git pull origin master:master
remote: Counting objects: 56, done.
remote: Compressing objects: 100% (35/35), done.
remote: Total 35 (delta 26), reused 0 (delta 0)
Unpacking objects: 100% (35/35), done.
From git@github.com:csinitiative/trisano
   276f2a0..4678e59  master     -> master
webapp/app/helpers/events_helper.rb: needs update
Merge made by recursive.
 webapp/app/controllers/events_controller.rb        |    2 +-
 .../app/controllers/morbidity_events_controller.rb |    7 ++-
 webapp/app/helpers/application_helper.rb           |    4 +
 webapp/app/models/human_event.rb                   |   71 ++++++++++++++++----
 webapp/app/models/place.rb                         |    4 +-
 .../views/morbidity_events/event_search.html.haml  |   31 +++++----
 webapp/app/views/morbidity_events/show.html.erb    |    2 +-
 webapp/config/routes.rb                            |   21 +++---
 .../db/migrate/20090610170846_add_array_accum.rb   |   19 +++++
 webapp/spec/models/place_spec.rb                   |    6 +-
 10 files changed, 121 insertions(+), 46 deletions(-)
 create mode 100644 webapp/db/migrate/20090610170846_add_array_accum.rb
$ git rebase master
webapp/app/helpers/events_helper.rb: needs update