summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-10-08 08:37:30 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-10-08 08:37:30 +0200
commit9c4e6026c498078aa223eae95f2c9752cb45525c (patch)
tree27e5fdfb0dde2013f5cb4710fcfd07ed07889159 /doc
parent0c158e03ceb509a08d3d4ded79c3151237f669dd (diff)
parent536fdb8823fdec24c26d984317b8162237c427c3 (diff)
Merge branch 'debian/sid' into debian/experimental
Conflicts: debian/changelog
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions