Merge pull request #61 from benwaugh/master
authorahmadia <aron@ahmadia.net>
Tue, 9 Jul 2013 01:37:23 +0000 (18:37 -0700)
committerW. Trevor King <wking@tremily.us>
Fri, 1 Nov 2013 20:52:17 +0000 (13:52 -0700)
Testing cheat sheet for #152


Trivial merge