From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sun, 23 Mar 2014 01:35:22 +0000 (+0100)
Subject: Merge branch 'master'
X-Git-Tag: 1.1~18
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=d01854ff8276207e5493c7c97a1e02cae81c64a0

Merge branch 'master'
---

d01854ff8276207e5493c7c97a1e02cae81c64a0