Merge http://github.com/twist/gitmagic
commit059b7610f8c648f49ca10d8697086dfe59c99b75
authorBen Lynn <benlynn@gmail.com>
Sat, 4 Sep 2010 14:12:49 +0000 (4 07:12 -0700)
committerBen Lynn <benlynn@gmail.com>
Sat, 4 Sep 2010 14:12:49 +0000 (4 07:12 -0700)
treec1bb9db9c1c2fa8acbf3116575bdba948a3059ea
parentbd828102b665f0d3c531d368f273bb47a3356c26
parent960bc0b238b871a8f0103ea7b2bd09922541d188
Merge http://github.com/twist/gitmagic