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


Trivial merge