From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Sat, 9 Mar 2013 14:51:31 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~5
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=605d913ae656ef9707a7f9cbca41f78d180d79dc;hp=cffc71d2abf4fafbed3d16b5c7226d522c336d38;p=deb_libcec.git

Merge branch 'master' into release
---