From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Tue, 18 Mar 2014 23:21:54 +0000 (+0100)
Subject: Merge branch 'epoxy' into epoxy
X-Git-Tag: 1.1~12^2~27
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=926348692a4138e9c88f49ef43657dedb5f36897;ds=sidebyside

Merge branch 'epoxy' into epoxy

Conflicts:
	Makefile.in
	movit.pc.in
---

926348692a4138e9c88f49ef43657dedb5f36897