Merge branch 'master' of ssh://git.nguyen.vg/hacks/simpleWebSlides
authorKim Nguyễn <kn@lri.fr>
Mon, 13 Apr 2015 10:47:04 +0000 (12:47 +0200)
committerKim Nguyễn <kn@lri.fr>
Mon, 13 Apr 2015 10:47:04 +0000 (12:47 +0200)

Trivial merge