| commit | ce2b3516fa3d8de4304227193586f7b1eabc0b33 | |
| author | Ben Lynn <benlynn@gmail.com> | |
| Fri, 19 Jul 2013 05:39:02 +0000 (18 22:39 -0700) | ||
| committer | Ben Lynn <benlynn@gmail.com> | |
| Fri, 19 Jul 2013 05:39:02 +0000 (18 22:39 -0700) | ||
| tree | dd9d6d53103a2d3845c7c7421c6b2e739d86cbd5 | treesnapshot (tar.gz zip) |
| parent | 3fbcfcb238c4839f8c08d3c501dac5b27b3b1fbf | commitdiff |
| parent | 6ba8a455d1747651dd73db8d457769417b47b4e7 | commitdiff |
Merge branch 'master' of https://github.com/matrig/gitmagic
Conflicts:
en/preface.txt
Conflicts:
en/preface.txt