From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Sun, 19 Feb 2012 10:30:15 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~34
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=0f1b44de471ac33cba9aa8f73bc174a17f606fdd;hp=fbaa8dd5bf5f227d430f42c3345ffcdce6132a8e;p=deb_libcec.git

Merge branch 'master' into release
---