From: Francois Fleuret <francois@fleuret.org>
Date: Mon, 16 Mar 2009 20:33:06 +0000 (+0100)
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=db57909a08ce6bf9ce426f37a383f7ab0678f171;p=selector.git

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

Conflicts:
	selector.cc
---

db57909a08ce6bf9ce426f37a383f7ab0678f171