Merge git://github.com/damianmichna/gitmagic
authorBen Lynn <benlynn@gmail.com>
Fri, 19 Jul 2013 05:44:38 +0000 (22:44 -0700)
committerBen Lynn <benlynn@gmail.com>
Fri, 19 Jul 2013 05:44:38 +0000 (22:44 -0700)
commit8080635cfb93d57fb69a7e8cdea893d3d989ceac
tree069cd77f5f20430c9321bbc1b27dfcb0ede10876
parentce2b3516fa3d8de4304227193586f7b1eabc0b33
parente72fc53811247b07a40ca1894f6f1ce8dea62c61
Merge git://github.com/damianmichna/gitmagic

Conflicts:
Makefile
13 files changed:
Makefile
en/preface.txt
pl/basic.txt
pl/branch.txt
pl/clone.txt
pl/drawbacks.txt
pl/grandmaster.txt
pl/history.txt
pl/intro.txt
pl/multiplayer.txt
pl/preface.txt
pl/secrets.txt
pl/translate.txt