From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Thu, 12 Jan 2012 22:48:20 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~40
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=75394e02e9e569d2f65d1f4a9f5a2a18b9b282cc;hp=d0d8b3c000e1aa12feeb555c2240e026c4a3dcf5;p=deb_libcec.git

Merge branch 'master' into release
---