| commit | 018947ef836578445e966361a564104c8d8f6399 | |
| author | Victor Zamanian <victor.zamanian@gmail.com> | |
| Tue, 28 Oct 2008 17:24:41 +0000 (28 18:24 +0100) | ||
| committer | Victor Zamanian <victor.zamanian@gmail.com> | |
| Tue, 28 Oct 2008 17:24:41 +0000 (28 18:24 +0100) | ||
| tree | 3057e3a578abcc46c91f06cd32f63e2833cfdc91 | treesnapshot (tar.gz zip) |
| parent | 34acef3607d4a3f1a42484efaa9092f317db778e | commitdiff |
| parent | 327913f3481f68dc525b7aac5632c00b0e2e471e | commitdiff |
Merge commit 'origin'
Conflicts:
books.bib
Conflicts:
books.bib
| books.bib | diff1 | diff2 | blobhistory |
| rapport.tex | diff1 | diff2 | blobhistory |