From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Thu, 17 May 2012 11:36:25 +0000 (+0200)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~26
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=23dfbc41d86f6b60ae8aeca9593587db1e18e5a3;hp=1478a43b4e9d57bdb0657bccf02bb6e128395c3b;p=deb_libcec.git

Merge branch 'master' into release
---