From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sat, 15 Mar 2014 02:12:53 +0000 (+0100)
Subject: Merge branch 'master' into epoxy
X-Git-Tag: 1.1~12^2~30
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=daca930fb2f404e8800c35715f1fc5c4897d19fb

Merge branch 'master' into epoxy
---

daca930fb2f404e8800c35715f1fc5c4897d19fb