Merge branch 'edition'
commitf83c4ae5b030c7ae80fb99256a5ff5dcfcf20876
authorJean-Denis Vauguet <jd@vauguet.fr>
Mon, 18 May 2009 12:27:07 +0000 (18 14:27 +0200)
committerJean-Denis Vauguet <jd@vauguet.fr>
Mon, 18 May 2009 12:27:07 +0000 (18 14:27 +0200)
treed39b8e02b5611b0b9ea5425eaf794a84335c58e4
parent5defd97489cecb8663f136fe6958af7042f113ef
parent9daa0cfaf0396b142a23a8afe631c6b8e8868c76
Merge branch 'edition'

Conflicts:

cv.tex