Merge https://github.com/vnwildman/gitmagic-vi
commit57fbba7561dabeb44ed22cb0811298aa4e001e48
authorBen Lynn <benlynn@gmail.com>
Sat, 26 Feb 2011 10:20:52 +0000 (26 02:20 -0800)
committerBen Lynn <benlynn@gmail.com>
Sat, 26 Feb 2011 10:20:52 +0000 (26 02:20 -0800)
tree111eebe4665ad514b0a70e63f849063bb92b1d9e
parent7ba07f42246cd9bf77fe69fe44f022fb5ec3cee3
parent9262629d43926c84ac1aa3bfa6785f2737a0a104
Merge https://github.com/vnwildman/gitmagic-vi

Conflicts:
.gitignore
.gitignore
vi/README
vi/basic.txt
vi/history.txt
vi/intro.txt
vi/preface.txt
vi/translate.txt