From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 19 Dec 2013 10:42:21 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 1.4.5~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bea4265bf3acd43fc4303b75a5f97c7709ab72f0;p=telemeta.git

Merge branch 'dev'

Conflicts:
	tools/scripts/transcode/transcode.py
---

bea4265bf3acd43fc4303b75a5f97c7709ab72f0