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

Merge branch 'master' into epoxy
---

dc03e3b0a5b0bbe8c6cdf5da9bc72376f79857b4