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

Merge branch 'master' into epoxy
---

8ea03db1932e4a76f457e0ecdfe31a4c8be0e0eb