Merge branch 'master' of https://github.com/matrig/gitmagic
authorBen Lynn <benlynn@gmail.com>
Thu, 27 Jun 2013 06:35:41 +0000 (26 23:35 -0700)
committerBen Lynn <benlynn@gmail.com>
Thu, 27 Jun 2013 06:35:41 +0000 (26 23:35 -0700)

Trivial merge