Merge pull request #1063 from ptzz/master
authorEvan Martin <martine@danga.com>
Sun, 6 Dec 2015 19:16:42 +0000 (11:16 -0800)
committerEvan Martin <martine@danga.com>
Sun, 6 Dec 2015 19:16:42 +0000 (11:16 -0800)
Fix typo


Trivial merge