diff options
| author | Simon McVittie <smcv@debian.org> | 2015-12-02 18:51:57 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2015-12-02 18:52:10 +0000 |
| commit | 5b0953fd5b165c6bb7aa3d12b79aded63aec8982 (patch) | |
| tree | f83d21d56c0b5457419ee4cb6394271972bbe7e3 | |
| parent | 2cd1862028134279893a500fef942184b2a04e15 (diff) | |
| parent | 6db53271b18a987a12cf0109f685646d4bc4aa7a (diff) | |
Merge branch 'dbus-1.10-ci'
No actual change; this is just to mark the conflicts as resolved.
0 files changed, 0 insertions, 0 deletions