Merge branch 'master' of ssh://git.nguyen.vg/hacks/simpleWebSlides
authorKim Nguyễn <kn@lri.fr>
Tue, 14 Oct 2014 10:54:51 +0000 (12:54 +0200)
committerKim Nguyễn <kn@lri.fr>
Tue, 14 Oct 2014 10:54:51 +0000 (12:54 +0200)
commit69b360cc5d48766c89395e89c7081a2736f1d5f6
treed998fa377712ea1e824e6f15f6f9fa9b2eb06e81
parent7fce0da628dba34dc5d6471ea23c67bff25c926e
parent5436fe97bfc05f29add3fba40b9d1b68aa4a9ae8
Merge branch 'master' of ssh://git.nguyen.vg/hacks/simpleWebSlides

Conflicts:
fds/fds.xhtml