From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Thu, 11 Oct 2012 15:14:12 +0000 (+0200)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~15
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=6be84fc462ace5e3b2bc0a0e68c3449de4310b33;p=deb_libcec.git

Merge branch 'master' into release
---

6be84fc462ace5e3b2bc0a0e68c3449de4310b33