From: Jérôme Benoit <jerome.benoit@piment-noir.org>
Date: Wed, 26 Nov 2014 02:28:34 +0000 (+0100)
Subject: Merge branch 'release' of https://github.com/Pulse-Eight/libcec into upstream
X-Git-Tag: upstream/2.2.0~1
X-Git-Url: https://git.piment-noir.org/?p=deb_libcec.git;a=commitdiff_plain;h=59c3a23b0f56d73f51ab3da439d7d2a01def9626

Merge branch 'release' of https://github.com/Pulse-Eight/libcec into upstream

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

Conflicts:
	debian/changelog
	debian/libcec-get-orig-source
	debian/rules
---

59c3a23b0f56d73f51ab3da439d7d2a01def9626