From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 24 Oct 2013 17:21:54 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5200ea924302a1ea3e54e56b4f039ba837b9d13a;p=piplayer.git

Merge branch 'dev'
---

5200ea924302a1ea3e54e56b4f039ba837b9d13a