From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Mon, 6 Aug 2012 10:35:16 +0000 (+0200)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~19
X-Git-Url: https://git.piment-noir.org/?p=deb_libcec.git;a=commitdiff_plain;h=34a9cecdd92f6b2844f9c4054da202b152ab2217

Merge branch 'master' into release
---

34a9cecdd92f6b2844f9c4054da202b152ab2217