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

Merge branch 'master' into epoxy

Conflicts:
	flat_input.cpp
---

ddf71f853e64c3912eed4ab98bfe7503826ce8e1