Merge branch 'patch-1' of https://github.com/Nioub/gitmagic
authorBen Lynn <benlynn@gmail.com>
Thu, 12 Apr 2012 06:42:59 +0000 (11 23:42 -0700)
committerBen Lynn <benlynn@gmail.com>
Thu, 12 Apr 2012 06:42:59 +0000 (11 23:42 -0700)

Trivial merge