Merge branch 'master' of ssh://fleuret@login.idiap.ch/homes/fleuret/public/git/selector
authorFrancois Fleuret <francois@fleuret.org>
Wed, 15 Apr 2009 07:40:16 +0000 (09:40 +0200)
committerFrancois Fleuret <francois@fleuret.org>
Wed, 15 Apr 2009 07:40:16 +0000 (09:40 +0200)
commit6bfacc5594cad8647f454cc3aab15068663d7bbb
tree4018574c202005b4476de3612617f690f4a22146
parent29247fe47748b96f076b9736b3f644418d323593
parent38e62ee50d9f4b6f77a34f6841a2db635e2553df
Merge branch 'master' of ssh://fleuret@login.idiap.ch/homes/fleuret/public/git/selector

Conflicts:
REVISION_NUMBER
REVISION_NUMBER