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

Merge branch 'master' into epoxy
---

12c11c0e615f7fc17ef7a600ff0c9099f7908dbc