From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Fri, 27 Jul 2012 18:09:57 +0000 (+0200)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~20
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=b0a5e4fc9b66620b00f937f7e9a406bf22aaaf1d;hp=f8edb2973d37f3ebfd08291f28be5435d0cf8f64;p=deb_libcec.git

Merge branch 'master' into release
---