Merge branch 'patch-1' of https://github.com/ggray/gitmagic
authorBen Lynn <benlynn@gmail.com>
Tue, 13 Mar 2012 06:22:53 +0000 (12 23:22 -0700)
committerBen Lynn <benlynn@gmail.com>
Tue, 13 Mar 2012 06:22:53 +0000 (12 23:22 -0700)

Trivial merge