Merge branch 'rus' of https://github.com/t-t/gitmagic
commitc33d8faaee9c7d736b55a6f2c6a36920760f69a3
authorBen Lynn <benlynn@gmail.com>
Thu, 27 Jan 2011 13:27:55 +0000 (27 05:27 -0800)
committerBen Lynn <benlynn@gmail.com>
Thu, 27 Jan 2011 13:33:50 +0000 (27 05:33 -0800)
treec7ceed7da69539179e049e8e7937da556e7d1f40
parent838f7b86cb422182e293b81b286226e7f7f197e0
parent9ceb5d23a5d199a3d14886a7ef0b116b134613e8
Merge branch 'rus' of https://github.com/t-t/gitmagic

Conflicts:
Makefile
ru/preface.txt
Makefile
en/clone.txt
ru/grandmaster.txt
ru/history.txt