# HG changeset patch
# User Anthony Ly <anthonyly.com@gmail.com>
# Date 1349254845 -7200
# Node ID 298c803245421a14a07ca39b19debab5c97340fb
# Parent  12565b1c303b9c6e853f9c8e13756491e7b9cc82# Parent  7c0054d574121ea9cf3ddb29e33ec50dbf52de75
merge et commit

diff -r 12565b1c303b -r 298c80324542 edwin.txt