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

Trivial merge