From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Mon, 8 Oct 2012 23:06:56 +0000 (+0200)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~17
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=95587b956c69ead0b46d301f5ca70e977890c3fd;p=deb_libcec.git

Merge branch 'master' into release
---

95587b956c69ead0b46d301f5ca70e977890c3fd