From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 14 Oct 2013 07:06:16 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/yomguy/PiPlayer
X-Git-Tag: 0.3~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fde3147bc5c0437a0cd8493f4d60493a572f4127;p=piplayer.git

Merge branch 'master' of https://github.com/yomguy/PiPlayer
---

fde3147bc5c0437a0cd8493f4d60493a572f4127