From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Sat, 3 Mar 2012 14:33:18 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~32
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=00a02d1d839c2155ee8abc3a37d10ab12b9881db;p=deb_libcec.git

Merge branch 'master' into release
---

00a02d1d839c2155ee8abc3a37d10ab12b9881db