From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Wed, 18 Dec 2013 01:16:24 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~2
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=81e38211724bc6e8bd7a60f484433053ed682635;p=deb_libcec.git

Merge branch 'master' into release
---

81e38211724bc6e8bd7a60f484433053ed682635