summaryrefslogtreecommitdiff
path: root/test/integration/test-bug-732746-preferences
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-01-25 22:40:04 +0100
committerMichael Vogt <mvo@debian.org>2014-01-25 22:40:04 +0100
commit6fa5b7b71e5c8ec5d4bec7bec3ef311c4d9c826b (patch)
treea02ec2b10f30e713eedd3f7c63cc44051fb6c859 /test/integration/test-bug-732746-preferences
parent72af508bdbca55d0752aab3369faa1dc944a04e7 (diff)
parent9aef3908c892f9d9349d8bf8a5ceaeea313ba0fe (diff)
Merge branch 'debian/sid' into ubuntu/master
Conflicts: configure.ac
Diffstat (limited to 'test/integration/test-bug-732746-preferences')
0 files changed, 0 insertions, 0 deletions