Merge branch 'master' of https://github.com/poole/poole
authorMark Otto <markdotto@gmail.com>
Fri, 26 Sep 2014 04:41:01 +0000 (21:41 -0700)
committerMark Otto <markdotto@gmail.com>
Fri, 26 Sep 2014 04:41:01 +0000 (21:41 -0700)

Trivial merge