Merge branch 'master' of https://github.com/poole/poole
authorMark Otto <markdotto@gmail.com>
Thu, 25 Sep 2014 17:39:25 +0000 (10:39 -0700)
committerMark Otto <markdotto@gmail.com>
Thu, 25 Sep 2014 17:39:25 +0000 (10:39 -0700)

Trivial merge