From: Jérôme Benoit <jerome.benoit@piment-noir.org>
Date: Mon, 1 Dec 2014 15:38:55 +0000 (+0100)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/2.2.0-3_trusty~3
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=586d23f626cb0304c1dbf29eab7b4ecb70068bfc;p=deb_libcec.git

Merge branch 'upstream'
---

586d23f626cb0304c1dbf29eab7b4ecb70068bfc