Merge branch 'typos' of git://github.com/sunny256/gitmagic
commit5bccb0bce72972c2cf975ae50822ef71deefe351
authorBen Lynn <benlynn@gmail.com>
Fri, 12 Mar 2010 07:43:54 +0000 (11 23:43 -0800)
committerBen Lynn <benlynn@gmail.com>
Fri, 12 Mar 2010 07:43:54 +0000 (11 23:43 -0800)
treed7b2984e7d357face376ba1c276c17ca5a6cfed8
parentcbd7c09a07c54bccd1a006540b0b2a1c39e0cf90
parent2065e6ff65d8b3eec7c7182ece8b389f46bc3a68
Merge branch 'typos' of git://github.com/sunny256/gitmagic

Conflicts:
en/branch.txt
en/branch.txt
en/clone.txt
en/history.txt