diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-01-23 10:33:35 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-01-23 10:33:35 +0000 |
| commit | 61758931005407de85952169e8253a72805e59ef (patch) | |
| tree | d787355c2f044bdec2c6a4f5e558f30be9af6c0e /test | |
| parent | 09207d4d4a9e4e68d0786a7b444343a75d57dfc6 (diff) | |
| parent | 08dd53c14b53b88cf798b910952ab3832b83c24c (diff) | |
Merge branch 'dbus-1.4', rejecting commit 08dd53c14b53b88c
Diffstat (limited to 'test')
0 files changed, 0 insertions, 0 deletions