From: Francois Fleuret <francois@fleuret.org>
Date: Wed, 15 Apr 2009 07:40:16 +0000 (+0200)
Subject: Merge branch 'master' of ssh://fleuret@login.idiap.ch/homes/fleuret/public/git/selector
X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=selector.git;a=commitdiff_plain;h=6bfacc5594cad8647f454cc3aab15068663d7bbb

Merge branch 'master' of ssh://fleuret@login.idiap.ch/homes/fleuret/public/git/selector

Conflicts:
	REVISION_NUMBER
---

6bfacc5594cad8647f454cc3aab15068663d7bbb
diff --cc REVISION_NUMBER
index fba7ed5,aaacbe6..87f6629
--- a/REVISION_NUMBER
+++ b/REVISION_NUMBER
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD:REVISION_NUMBER
 +143
++=======
+ 142
++>>>>>>> 38e62ee50d9f4b6f77a34f6841a2db635e2553df:REVISION_NUMBER