From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Sun, 9 Oct 2011 17:31:22 +0000 (+0200)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~118^2~7
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=d9ba5beabe6933fe1c98590cc461bddf1f16c35c;p=deb_libcec.git

Merge branch 'master' into release
---

d9ba5beabe6933fe1c98590cc461bddf1f16c35c