Merge branch 'release-1.0.1' into releases v1.0.1
authorDan Vanderkam <danvdk@gmail.com>
Thu, 29 Aug 2013 22:56:18 +0000 (18:56 -0400)
committerDan Vanderkam <danvdk@gmail.com>
Thu, 29 Aug 2013 22:56:18 +0000 (18:56 -0400)

Trivial merge