Merge https://github.com/t-t/gitmagic
commit0d369d0dfd6c6e66b00488777a48cda963e3d739
authorBen Lynn <benlynn@gmail.com>
Sun, 12 Jun 2011 18:45:16 +0000 (12 11:45 -0700)
committerBen Lynn <benlynn@gmail.com>
Sun, 12 Jun 2011 18:45:16 +0000 (12 11:45 -0700)
treeda0a4f0ac997358cc97f1a8b1014a42cdc36604a
parent81baba39a4f1dd934f9698f9f74cdb6ca1ddad77
parent44a1e4b91e99928ef43146db851c4016e3c86c91
Merge https://github.com/t-t/gitmagic