Merge with 25559acf1f833d99bf7a232563bf8d3ef2e94328
authorymh <ymh.work@gmail.com>
Thu, 29 Sep 2011 11:27:00 +0200
changeset 50 18ec53c9192f
parent 49 63c25c8e2fc2 (current diff)
parent 25 25559acf1f83 (diff)
child 51 aad53a6e2a96
Merge with 25559acf1f833d99bf7a232563bf8d3ef2e94328
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