From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 6 Jan 2014 16:30:34 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: dbus-1.7.10~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e04bd56a3438ac6473f457e1560ccad06b4e86b4;p=thirdparty%2Fdbus.git

Merge remote-tracking branch 'origin/master'
---

e04bd56a3438ac6473f457e1560ccad06b4e86b4