{"shas":[["b55eba93c7c0d0ac66b8eb0886e4718736f29ba5","057fcd9839476a1cd62221d2b9200b4bb86b61b0@gmail.com","Added mysql2 as default","Nathan B"],["eec20f0c00c6b80fa7c6bd491519d2a845fcaf64","057fcd9839476a1cd62221d2b9200b4bb86b61b0@gmail.com","Merge branch 'ffcrm_rails3' into cr_merge\n\nConflicts:\n\tGemfile\n\tGemfile.lock\n\tapp/controllers/accounts_controller.rb\n\tapp/helpers/admin/users_helper.rb\n\tapp/helpers/home_helper.rb\n\tapp/models/activity.rb\n\tapp/views/accounts/_top_section.html.haml\n\tapp/views/tasks/_pending.html.haml\n\tlib/tasks/fat_free_crm.rake\n\tspec/controllers/tasks_controller_spec.rb","Nathan B"],["190db348352d4208c19c85c5740b46618842673f","057fcd9839476a1cd62221d2b9200b4bb86b61b0@gmail.com","Removed gitmodules and Capfile","Nathan B"],["7af79773458352a204491bf40434c167a7c7f89a","057fcd9839476a1cd62221d2b9200b4bb86b61b0@gmail.com","removed hoptoad code from Rakefile","Nathan B"]],"repo":"crossroads/fat_free_crm","actor":"ndbroadbent","ref":"refs/heads/cr_merge","size":4,"head":"7af79773458352a204491bf40434c167a7c7f89a","actor_gravatar":"4931eceec58528529fd004e56af197c4","push_id":26908754}