From: Simon McVittie Date: Wed, 2 Dec 2015 18:51:57 +0000 (+0000) Subject: Merge branch 'dbus-1.10-ci' X-Git-Tag: dbus-1.11.0~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b0953fd5b165c6bb7aa3d12b79aded63aec8982;p=thirdparty%2Fdbus.git Merge branch 'dbus-1.10-ci' No actual change; this is just to mark the conflicts as resolved. --- 5b0953fd5b165c6bb7aa3d12b79aded63aec8982