From: Kim Nguyễn <kn@lri.fr>
Date: Tue, 14 Oct 2014 10:54:51 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.nguyen.vg/hacks/simpleWebSlides
X-Git-Url: http://git.nguyen.vg/gitweb/?p=hacks%2FsimpleWebSlides.git;a=commitdiff_plain;h=69b360cc5d48766c89395e89c7081a2736f1d5f6

Merge branch 'master' of ssh://git.nguyen.vg/hacks/simpleWebSlides

Conflicts:
	fds/fds.xhtml
---

69b360cc5d48766c89395e89c7081a2736f1d5f6