Merge branch 'newtext' of git://github.com/sunny256/gitmagic
commitf392970624192c9453f0ab9ce941fee82ce52da0
authorBen Lynn <benlynn@gmail.com>
Fri, 12 Mar 2010 07:44:04 +0000 (11 23:44 -0800)
committerBen Lynn <benlynn@gmail.com>
Fri, 12 Mar 2010 07:44:04 +0000 (11 23:44 -0800)
tree92f3a0b4baaa14f831e729ac0c4b438856d63885
parent5bccb0bce72972c2cf975ae50822ef71deefe351
parent84b18418f1ff6c2caa316e19b0d0bc401a11b8eb
Merge branch 'newtext' of git://github.com/sunny256/gitmagic
en/history.txt