From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Fri, 31 Oct 2014 19:11:22 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=2a80b46be78e9d849de223ab73b6f3e7b4d9fc46;p=deb_libcec.git

Merge branch 'master' into release
---

2a80b46be78e9d849de223ab73b6f3e7b4d9fc46