Merge branch 'master' of https://github.com/matrig/gitmagic
authorBen Lynn <benlynn@gmail.com>
Wed, 5 Jun 2013 05:24:44 +0000 (4 22:24 -0700)
committerBen Lynn <benlynn@gmail.com>
Wed, 5 Jun 2013 05:24:44 +0000 (4 22:24 -0700)

Trivial merge