From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Sat, 12 Nov 2011 12:39:02 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~45
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=2491aac1eaaee68ff9f1515a770f11d2a12fe20b;p=deb_libcec.git

Merge branch 'master' into release
---

2491aac1eaaee68ff9f1515a770f11d2a12fe20b