Merge branch 'master' of https://github.com/baijum/gitmagic
authorBen Lynn <benlynn@gmail.com>
Mon, 10 Dec 2012 03:25:22 +0000 (9 19:25 -0800)
committerBen Lynn <benlynn@gmail.com>
Mon, 10 Dec 2012 03:25:22 +0000 (9 19:25 -0800)

Trivial merge