# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1317288420 -7200
# Node ID 18ec53c9192f2521b0ee0a90fb9417f2d5e1e936
# Parent  63c25c8e2fc268fdb6d2df9efdd803edbcef2803# Parent  25559acf1f833d99bf7a232563bf8d3ef2e94328
Merge with 25559acf1f833d99bf7a232563bf8d3ef2e94328

diff -r 63c25c8e2fc2 -r 18ec53c9192f README
--- a/README	Thu Sep 29 11:24:52 2011 +0200
+++ b/README	Thu Sep 29 11:27:00 2011 +0200
@@ -14,3 +14,4 @@
 beep beep
 
 toto from gautier
+In branch boris - merged