Merge branch 'master' of /git/bmh-cv
authorwww-data <www-data@epicenter.media.mit.edu>
Sun, 9 Sep 2012 15:39:18 +0000 (11:39 -0400)
committerwww-data <www-data@epicenter.media.mit.edu>
Sun, 9 Sep 2012 15:39:18 +0000 (11:39 -0400)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?