Merge branch 'master' of /git/bmh-cv
authorwww-data <www-data@epicenter.media.mit.edu>
Tue, 30 Oct 2012 19:30:58 +0000 (15:30 -0400)
committerwww-data <www-data@epicenter.media.mit.edu>
Tue, 30 Oct 2012 19:30:58 +0000 (15:30 -0400)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?