Merge branch 'master' of https://github.com/matrig/gitmagic
authorBen Lynn <benlynn@gmail.com>
Sat, 15 Jun 2013 04:20:40 +0000 (14 21:20 -0700)
committerBen Lynn <benlynn@gmail.com>
Sat, 15 Jun 2013 04:20:40 +0000 (14 21:20 -0700)

Trivial merge