bkase/rebase-harder — pull request #13 by Gilliet (2013-11-22 16:27:44+00:00)
Title: rebased gtr-rebase-me

Rebased gtr-rebase-me, and hopefully I did so correctly!
I was going to try to think up a funny commit message, but then I realized I want to play pokemon instead.