From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Fri, 1 Apr 2016 14:07:15 +0000 (+0200)
Subject: Merge branch 'master' of wpitchoune.net:/srv/git/mp3tohtml
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=mp3tohtml.git;a=commitdiff_plain;h=HEAD

Merge branch 'master' of wpitchoune.net:/srv/git/mp3tohtml
---

ea792a94468262ef353239458736b507a7e1ef18