From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Tue, 3 Jan 2012 23:59:54 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~42
X-Git-Url: https://git.piment-noir.org/?p=deb_libcec.git;a=commitdiff_plain;h=2b2767288398d6cdcbe1201a8b52ef515a5f6591

Merge branch 'master' into release
---

2b2767288398d6cdcbe1201a8b52ef515a5f6591