From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Sat, 28 Apr 2012 00:19:17 +0000 (+0200)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~29
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=e14b15876a6d4b601973d01905eb2a6a0daeedcb;hp=466925f5c43536e5fd96632615810da783b78096;p=deb_libcec.git

Merge branch 'master' into release
---