]> git.parisson.com Git - telemeta-doc.git/commit
Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telemeta-doc
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 11 Oct 2013 09:24:12 +0000 (11:24 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 11 Oct 2013 09:24:12 +0000 (11:24 +0200)
commit169d44bb12f1458591b5619db8849a14f6759e57
tree9ae0154c20293fddbcf47200cf17425043f325f9
parent11f40bd082f87287ee3446543a9d977ecd0aadf9
parent070589c7f5e5e86f4a53063a773c9eda7294839b
Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telemeta-doc

Conflicts:
CMMR_2013/poster/poster_cmmr2013.tex
CMMR_2013/poster/poster_cmmr2013.tex