From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Thu, 29 Dec 2011 02:11:43 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~43
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=fe0cd8aa72091d860ad374abcbc0d8217f25ba69;hp=188d35cfc02323537f3b938906462f4e415c3c1e;p=deb_libcec.git

Merge branch 'master' into release
---