]> git.parisson.com Git - telemeta-doc.git/commit
Merge branch 'master' of git.parisson.com:git/telemeta-doc
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 12 May 2014 12:15:39 +0000 (14:15 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 12 May 2014 12:15:39 +0000 (14:15 +0200)
commit2e6f62eab12f8324eec04e85b2d6a1bfa8b02ad4
treefa0ceff8bbd33e99c161e8a6b01656ea1df202b5
parent067f85e09c22b45dbeb146076733653fca6f6c49
parentd89fdc0773172c3df18d3736684ce5b4e7e532e2
Merge branch 'master' of git.parisson.com:git/telemeta-doc

Conflicts:
Publications/Conferences/2014_FMA/fma2014_Telemeta.tex
Publications/Conferences/2014_FMA/fma2014_Telemeta.tex