0000000000000000000000000000000000000000 5a2dad91c7e4e95798cad4b680806c29e69e5a08 Willem Liu <willem.liu@gmail.com> 1304124254 +0200	branch: Created from HEAD
5a2dad91c7e4e95798cad4b680806c29e69e5a08 23e41b20283a01bfe0401078ce6092bb429d5cd8 Willem Liu <willem.liu@gmail.com> 1304124373 +0200	commit (merge): Fixed merge conflict
