jlong/serve — pull request #70 by bmaland (2012-04-06 20:37:07+00:00)
Title: Squashed version of #65

See #65 and #69 for details.