Commit 7f0d1a80c7871a97dcf6495fba9f0e3c8d86be81 Parent c818df9888d452f0ae54b3a504eefdd970fd73d8 Author John MacFarlane <jgm@berkeley.edu> Date Fri, 24 Oct 2014 20:15:04 -0700 Merge branch 'abduelhamit-master'