From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Fri, 25 Apr 2014 09:38:01 +0000 (+0200)
Subject: Delete merge cruft.
X-Git-Tag: hpcc2014_submission~67
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/hpcc2014.git/commitdiff_plain/da679beb2e5ea3a7a07a474d5a751de50de54f8b?hp=da679beb2e5ea3a7a07a474d5a751de50de54f8b

Delete merge cruft.
---