Merge pull request #97 from rocktavious/master
authorSalim Fadhley <sal@stodge.org>
Tue, 11 Jun 2013 23:07:33 +0000 (16:07 -0700)
committerSalim Fadhley <sal@stodge.org>
Tue, 11 Jun 2013 23:07:33 +0000 (16:07 -0700)
I'm merging this one in, but please ensure that all future changes come with a unit-test that covers the changed code.


Trivial merge