From: Denise sur sakamain <sekhmet@sakamain.(none)>
Date: Wed, 17 Dec 2014 19:16:11 +0000 (+0100)
Subject: Merge branch 'master' of immae.eu:perso/Denise/aventuriers
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;ds=sidebyside;h=c4c2b0fc59676da85d8eada1a5cc6d17614ca0c8;hp=c4c2b0fc59676da85d8eada1a5cc6d17614ca0c8;p=perso%2FDenise%2Faventuriers.git

Merge branch 'master' of immae.eu:perso/Denise/aventuriers

Conflicts:
	aventuriers.html
	aventuriers.pdf
	html/aventuriers.html
---