From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Wed, 27 Jun 2012 08:30:58 +0000 (+0200)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~22
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=d968b075dd7f0a4a96175045dbf4e20b7aa32872;p=deb_libcec.git

Merge branch 'master' into release
---

d968b075dd7f0a4a96175045dbf4e20b7aa32872