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

Merge branch 'master' into epoxy
---

5ee3e6bb0bf100d57a06911b89c3a0a0dc49e2be