From: couturie <couturie@carcariass.(none)>
Date: Sun, 30 Jan 2011 13:37:03 +0000 (+0100)
Subject: Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/loba
X-Git-Tag: v0.1~188
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/commitdiff_plain/4e922bca67d7cf4bc30a878cd7cd46d39fbe1573?hp=4e922bca67d7cf4bc30a878cd7cd46d39fbe1573

Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/loba

Conflicts:
	loba_fairstrategy.cpp
---