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

Merge branch 'master' into epoxy
---

b757191bc6d258887445d88cdfe5b18666295660