summaryrefslogtreecommitdiff
path: root/test/integration/test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2015-05-07 10:41:34 +0200
committerMichael Vogt <mvo@ubuntu.com>2015-05-07 10:41:34 +0200
commitaccd8215ca9a1cb10e92a059d71eb02aac2f0743 (patch)
treead673f0421bf5dc2b3f6ab5e91f5dd074bd2661c /test/integration/test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings
parentb32f5e0d93608f82a7516440a6da7a3131eb358e (diff)
parent4694e07d450baa13fa04482752ca369a5797c640 (diff)
Merge branch 'debian/jessie' into ubuntu/master1.0.9.9ubuntu1
Conflicts: configure.ac debian/changelog
Diffstat (limited to 'test/integration/test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings')
0 files changed, 0 insertions, 0 deletions