From: Kim Nguyễn <kn@lri.fr>
Date: Mon, 13 Apr 2015 22:59:06 +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=a6b33eace6319c89d430ae05120c0aea1061212a

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

* 'master' of ssh://git.nguyen.vg/hacks/simpleWebSlides:
  .
  .
---

a6b33eace6319c89d430ae05120c0aea1061212a