Merge branch 'master' into notes
authorTom Hughes <tom@compton.nu>
Mon, 8 Apr 2013 21:34:37 +0000 (22:34 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 8 Apr 2013 21:34:37 +0000 (22:34 +0100)
commit7f598ab412674ce5a78da98c54aa2fe2e4a05792
tree590b4d83c815f8e858553bf6609921f685113ca5
parent979822f697ec100b4b96eff05ce3b39b462e7a7d
parent22760a3cc89a3ef9ba65dfd0c5a57a93cde12ccd
Merge branch 'master' into notes

Conflicts:
Gemfile.lock
app/views/diary_entry/list.html.erb
Gemfile.lock
app/controllers/application_controller.rb