--- 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