Fixed merge conflict merge-requests/1
authorWillem Liu <willem.liu@gmail.com>
Sat, 30 Apr 2011 00:46:13 +0000 (02:46 +0200)
committerWillem Liu <willem.liu@gmail.com>
Sat, 30 Apr 2011 00:46:13 +0000 (02:46 +0200)
commit23e41b20283a01bfe0401078ce6092bb429d5cd8
tree7abc75f1d558eb10bb2be22f4450ddd61ea81901
parent5a2dad91c7e4e95798cad4b680806c29e69e5a08
parentebec048c9715eb54fd5495d58193ea944c5b4f94
Fixed merge conflict