Merge branch 'master' of /git/bmh-cv
authorwww-data <www-data@epicenter.media.mit.edu>
Sun, 30 Dec 2012 21:15:40 +0000 (16:15 -0500)
committerwww-data <www-data@epicenter.media.mit.edu>
Sun, 30 Dec 2012 21:15:40 +0000 (16:15 -0500)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?