summaryrefslogtreecommitdiff
path: root/debian/apt.examples
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-04-28 12:50:47 +0200
committerMichael Vogt <mvo@debian.org>2014-04-28 12:50:47 +0200
commit77efe478cc59fe205c35036bae8c0d5e0e6913d7 (patch)
tree292ddf183b3f38c299bd6614fbd48585aa6d00b2 /debian/apt.examples
parent814e1b8d623cb1e6b03c79fcdab6b20754c57038 (diff)
parent038e721ad2557fd517eae4b102cd36080f4ee6e3 (diff)
Merge branch 'debian/sid' into ubuntu/master
Conflicts: po/vi.po
Diffstat (limited to 'debian/apt.examples')
0 files changed, 0 insertions, 0 deletions