Merge branch 'master' of /git/bmh-cv
authorwww-data <www-data@epicenter.media.mit.edu>
Wed, 22 Aug 2012 17:41:05 +0000 (13:41 -0400)
committerwww-data <www-data@epicenter.media.mit.edu>
Wed, 22 Aug 2012 17:41:05 +0000 (13:41 -0400)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?