From: yomguy <yomguy@parisson.com>
Date: Wed, 19 Sep 2012 12:23:05 +0000 (+0200)
Subject: Merge branch 'dev' into gst
X-Git-Tag: 0.3.4-noleekmp3~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1d2cfcd4035bce19ad18e1df8eb1d85952a2a2c6;p=timeside.git

Merge branch 'dev' into gst
---

1d2cfcd4035bce19ad18e1df8eb1d85952a2a2c6