Merge branch 'master' of /git/bmh-cv
authorwww-data <www-data@epicenter.media.mit.edu>
Thu, 13 Sep 2012 01:04:16 +0000 (21:04 -0400)
committerwww-data <www-data@epicenter.media.mit.edu>
Thu, 13 Sep 2012 01:04:16 +0000 (21:04 -0400)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?