From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Thu, 13 Mar 2014 20:44:24 +0000 (+0100)
Subject: Merge branch 'master' into epoxy
X-Git-Tag: 1.1~12^2~31
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=c5b9c3df43caa7a88f2f729a5c52359ca8ca537f

Merge branch 'master' into epoxy
---

c5b9c3df43caa7a88f2f729a5c52359ca8ca537f