Merge https://github.com/vnwildman/gitmagic
authorBen Lynn <benlynn@gmail.com>
Mon, 30 Apr 2012 07:57:38 +0000 (30 00:57 -0700)
committerBen Lynn <benlynn@gmail.com>
Mon, 30 Apr 2012 07:57:38 +0000 (30 00:57 -0700)

Trivial merge