Merge branch 'master' of https://github.com/Pinkilla/gitmagic
authorBen Lynn <benlynn@gmail.com>
Tue, 29 Oct 2013 06:14:16 +0000 (28 23:14 -0700)
committerBen Lynn <benlynn@gmail.com>
Tue, 29 Oct 2013 06:14:16 +0000 (28 23:14 -0700)

Trivial merge