From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Mon, 11 Jun 2012 13:49:29 +0000 (+0200)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~23
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=b9761e8922a75fbff7887cf7fd5b6e4e3eba0709;hp=142d9730b03e137b8cf5b11c2435e5544ea235dc;p=deb_libcec.git

Merge branch 'master' into release
---