Merge branch 'master' of ssh://wpitchoune.net:/srv/git/radio master
authorJean-Philippe Orsini <jeanfi@gmail.com>
Fri, 1 Apr 2016 13:54:16 +0000 (15:54 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Fri, 1 Apr 2016 13:54:16 +0000 (15:54 +0200)

Trivial merge