Merge branch 'release' of https://github.com/Pulse-Eight/libcec into upstream
authorJérôme Benoit <jerome.benoit@piment-noir.org>
Wed, 26 Nov 2014 02:28:34 +0000 (03:28 +0100)
committerJérôme Benoit <jerome.benoit@piment-noir.org>
Wed, 26 Nov 2014 02:28:34 +0000 (03:28 +0100)
commit59c3a23b0f56d73f51ab3da439d7d2a01def9626
treef54808e138ab224c10abae04f5bb5b69deb56a6e
parentcbbe90dd5f76a5670d3eb8754fcbf47c16aab2b7
parent2a80b46be78e9d849de223ab73b6f3e7b4d9fc46
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