Separate lunch and dinner history
Merge remote-tracking branch 'upstream/master' into separate-history
Merge pull request #3 from smrq/separate-history

Separate lunch and dinner history