From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Mon, 13 May 2013 13:09:14 +0000 (+0200)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~4
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=54be21e43ea5b0268858e09f0252bb3909ef6132;p=deb_libcec.git

Merge branch 'master' into release
---

54be21e43ea5b0268858e09f0252bb3909ef6132