Commit f9919992d52356166ff4fcc9e4e4754d2a365e14 Parent 82ea9598bf55320d1161d8ec672c2ac678e2d0f4 Author John MacFarlane <jgm@berkeley.edu> Date Tue, 31 May 2016 13:16:00 -0700 Merge pull request #128 from kevinburke/copyright Add 2016 to copyright