From: Francois Fleuret <francois@fleuret.org>
Date: Mon, 13 Apr 2009 13:03:21 +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?a=commitdiff_plain;h=0b612866f322be462e80586db5bd4bce6d4fefe9;hp=d315ca7da55314820815549dec320f68290c4e90;p=selector.git

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

Conflicts:
	selector.cc
---