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

Merge branch 'master' into epoxy
---

1320ed72d619610b9f056c106496dfe7dbd95e06