From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 24 Oct 2013 16:45:38 +0000 (+0200)
Subject: Merge branch 'dev' of git.parisson.com:git/piplayer into dev
X-Git-Tag: 0.3.1~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=21befc2cca1f24175b2552e6f71ab7194f79091e;p=piplayer.git

Merge branch 'dev' of git.parisson.com:git/piplayer into dev
---

21befc2cca1f24175b2552e6f71ab7194f79091e