0000000000000000000000000000000000000000 acecd5ea2924a4b900e7e149496e1f4b57976e51 J. David Ibañez <jdavid@itaapy.com> 1297179898 +0100	commit (initial): First commit
acecd5ea2924a4b900e7e149496e1f4b57976e51 acecd5ea2924a4b900e7e149496e1f4b57976e51 J. David Ibañez <jdavid@itaapy.com> 1297696861 +0100	checkout: moving from master to i18n
acecd5ea2924a4b900e7e149496e1f4b57976e51 6aaa262e655dd54252e5813c8e5acd7780ed097d J. David Ibañez <jdavid@itaapy.com> 1297696877 +0100	commit: Say hello in Spanish
6aaa262e655dd54252e5813c8e5acd7780ed097d 4ec4389a8068641da2d6578db0419484972284c8 J. David Ibañez <jdavid@itaapy.com> 1297696908 +0100	commit: Say hello in French
4ec4389a8068641da2d6578db0419484972284c8 acecd5ea2924a4b900e7e149496e1f4b57976e51 J. David Ibañez <jdavid@itaapy.com> 1297696932 +0100	checkout: moving from i18n to master
acecd5ea2924a4b900e7e149496e1f4b57976e51 5ebeeebb320790caf276b9fc8b24546d63316533 J. David Ibañez <jdavid@itaapy.com> 1297696974 +0100	commit: Add .gitignore file
5ebeeebb320790caf276b9fc8b24546d63316533 2be5719152d4f82c7302b1c0932d8e5f0a4a0e98 J. David Ibañez <jdavid@itaapy.com> 1297697074 +0100	merge i18n: Merge made by recursive.
2be5719152d4f82c7302b1c0932d8e5f0a4a0e98 4ec4389a8068641da2d6578db0419484972284c8 Nico von Geyso <Nico.Geyso@FU-Berlin.de> 1361101720 +0100	checkout: moving from master to i18n
4ec4389a8068641da2d6578db0419484972284c8 5470a671a80ac3789f1a6a8cefbcf43ce7af0563 Nico von Geyso <Nico.Geyso@FU-Berlin.de> 1361101763 +0100	commit: added bye.txt and new
5470a671a80ac3789f1a6a8cefbcf43ce7af0563 2be5719152d4f82c7302b1c0932d8e5f0a4a0e98 Nico von Geyso <Nico.Geyso@FU-Berlin.de> 1361101765 +0100	checkout: moving from i18n to master
2be5719152d4f82c7302b1c0932d8e5f0a4a0e98 4ec4389a8068641da2d6578db0419484972284c8 Your Name <you@example.com> 1386002195 +0100	checkout: moving from master to 4ec4389a8068641da2d6578db0419484972284c8
4ec4389a8068641da2d6578db0419484972284c8 4ec4389a8068641da2d6578db0419484972284c8 Your Name <you@example.com> 1386002203 +0100	checkout: moving from 4ec4389a8068641da2d6578db0419484972284c8 to pep8-fixes
4ec4389a8068641da2d6578db0419484972284c8 03490f16b15a09913edb3a067a3dc67fbb8d41f1 Victor Garcia <bravejolie@gmail.com> 1386002309 +0100	commit: new file bye.txt
03490f16b15a09913edb3a067a3dc67fbb8d41f1 2be5719152d4f82c7302b1c0932d8e5f0a4a0e98 Victor Garcia <bravejolie@gmail.com> 1386002320 +0100	checkout: moving from pep8-fixes to master
2be5719152d4f82c7302b1c0932d8e5f0a4a0e98 2be5719152d4f82c7302b1c0932d8e5f0a4a0e98 Victor Garcia <bravejolie@gmail.com> 1386002339 +0100	checkout: moving from master to master
2be5719152d4f82c7302b1c0932d8e5f0a4a0e98 2be5719152d4f82c7302b1c0932d8e5f0a4a0e98 Victor Garcia <bravejolie@gmail.com> 1386003869 +0100	checkout: moving from master to master
2be5719152d4f82c7302b1c0932d8e5f0a4a0e98 03490f16b15a09913edb3a067a3dc67fbb8d41f1 Victor Garcia <bravejolie@gmail.com> 1386003931 +0100	checkout: moving from master to pep8-fixes
03490f16b15a09913edb3a067a3dc67fbb8d41f1 2be5719152d4f82c7302b1c0932d8e5f0a4a0e98 Victor Garcia <bravejolie@gmail.com> 1386004043 +0100	checkout: moving from pep8-fixes to master
2be5719152d4f82c7302b1c0932d8e5f0a4a0e98 2be5719152d4f82c7302b1c0932d8e5f0a4a0e98 Victor Garcia <bravejolie@gmail.com> 1386009479 +0100	checkout: moving from master to ff-branch
2be5719152d4f82c7302b1c0932d8e5f0a4a0e98 e97b4cfd5db0fb4ebabf4f203979ca4e5d1c7c87 Victor Garcia <bravejolie@gmail.com> 1386009618 +0100	commit: welcome message
e97b4cfd5db0fb4ebabf4f203979ca4e5d1c7c87 2be5719152d4f82c7302b1c0932d8e5f0a4a0e98 Victor Garcia <bravejolie@gmail.com> 1386009798 +0100	checkout: moving from ff-branch to master
2be5719152d4f82c7302b1c0932d8e5f0a4a0e98 4ec4389a8068641da2d6578db0419484972284c8 Victor Garcia <bravejolie@gmail.com> 1386161061 +0100	checkout: moving from master to 4ec4389a8068641da2d6578db0419484972284c8
4ec4389a8068641da2d6578db0419484972284c8 4ec4389a8068641da2d6578db0419484972284c8 Victor Garcia <bravejolie@gmail.com> 1386161075 +0100	checkout: moving from 4ec4389a8068641da2d6578db0419484972284c8 to branch-conflicts
4ec4389a8068641da2d6578db0419484972284c8 1b2bae55ac95a4be3f8983b86cd579226d0eb247 Victor Garcia <bravejolie@gmail.com> 1386161215 +0100	commit: commit to provoke a conflict
1b2bae55ac95a4be3f8983b86cd579226d0eb247 2be5719152d4f82c7302b1c0932d8e5f0a4a0e98 Victor Garcia <bravejolie@gmail.com> 1386161238 +0100	checkout: moving from branch-conflicts to master
