Merge branch 'master' of https://github.com/matrig/gitmagic
authorBen Lynn <benlynn@gmail.com>
Fri, 19 Jul 2013 05:39:02 +0000 (22:39 -0700)
committerBen Lynn <benlynn@gmail.com>
Fri, 19 Jul 2013 05:39:02 +0000 (22:39 -0700)
commitce2b3516fa3d8de4304227193586f7b1eabc0b33
treedd9d6d53103a2d3845c7c7421c6b2e739d86cbd5
parent3fbcfcb238c4839f8c08d3c501dac5b27b3b1fbf
parent6ba8a455d1747651dd73db8d457769417b47b4e7
Merge branch 'master' of https://github.com/matrig/gitmagic

Conflicts:
en/preface.txt
it/basic.txt
it/branch.txt
it/clone.txt
it/drawbacks.txt
it/grandmaster.txt
it/history.txt
it/intro.txt
it/multiplayer.txt
it/preface.txt
it/secrets.txt