0000000000000000000000000000000000000000 4ec4389a8068641da2d6578db0419484972284c8 Victor Garcia <bravejolie@gmail.com> 1386161073 +0100	branch: Created from HEAD
4ec4389a8068641da2d6578db0419484972284c8 1b2bae55ac95a4be3f8983b86cd579226d0eb247 Victor Garcia <bravejolie@gmail.com> 1386161215 +0100	commit: commit to provoke a conflict
