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

Merge branch 'master' into epoxy

Conflicts:
	Makefile.in
	configure.ac
---