Merge branch 'master' of https://github.com/poole/poole
authorMark Otto <otto@github.com>
Tue, 31 Dec 2013 01:58:56 +0000 (17:58 -0800)
committerMark Otto <otto@github.com>
Tue, 31 Dec 2013 01:58:56 +0000 (17:58 -0800)

Trivial merge