Merge https://github.com/vnwildman/gitmagic
commitd6f483acfc049923628cc049f2b4fe22afd580a4
authorBen Lynn <benlynn@gmail.com>
Mon, 16 Jan 2012 07:31:20 +0000 (15 23:31 -0800)
committerBen Lynn <benlynn@gmail.com>
Mon, 16 Jan 2012 07:31:20 +0000 (15 23:31 -0800)
tree8fa85cf0154a21e33c3ec950f180982670d35f13
parent200c82f9d075994c3ae3ec604233d3a34e85484c
parent56b1b6e185a6f4e629da8eab4a5503beb677c611
Merge https://github.com/vnwildman/gitmagic