From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Mon, 10 Mar 2014 00:28:46 +0000 (+0100)
Subject: Merge branch 'master' into epoxy
X-Git-Tag: 1.1~12^2~39
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=8c7e53028a3ef4805d2608643041a5d7e6bd1b6e;hp=8c7e53028a3ef4805d2608643041a5d7e6bd1b6e

Merge branch 'master' into epoxy
---