Backed up at 2013-09-28T15:54:01.037778
Backed up at 2013-09-28T16:00:22.641756
Backed up at 2013-09-28T16:10:18.133705
Backed up at 2013-09-28T16:20:18.563498
Backed up at 2013-09-28T16:30:18.904670
Backed up at 2013-09-28T16:40:17.696605
Backed up at 2013-09-28T16:50:18.927066
Backed up at 2013-09-28T17:00:24.143308
Backed up at 2013-09-28T17:10:17.899926
Backed up at 2013-09-28T17:20:18.813611
Backed up at 2013-09-28T17:30:19.299389
Backed up at 2013-09-28T17:40:18.616529
Backed up at 2013-09-28T18:00:20.003775
Backed up at 2013-09-28T19:00:08.101301
Manual backup
Merge branch 'master' of github.com:open-city/civic-json-files

Conflicts:
	organizations.json
	people.json
	project_details.json