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)
Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>
Conflicts:
debian/changelog
debian/libcec-get-orig-source
debian/rules


Trivial merge