diff options
| author | Michael Vogt <mvo@debian.org> | 2014-04-10 10:37:03 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-04-10 10:37:03 +0200 |
| commit | b3f695d42baa95139e8172e97b0f4ab38550b7b5 (patch) | |
| tree | 0aa1bc53b760b1c33acf662ea8614e128ccb34d0 /doc/files.sgml | |
| parent | a1a253e8be978998b66af62240a25864db2cc694 (diff) | |
| parent | 128aa7d3630f138f37ef83e3e8564feca01ec429 (diff) | |
Merge remote-tracking branch 'origin/debian/sid' into ubuntu/master1.0.1ubuntu1
Conflicts:
debian/changelog
Diffstat (limited to 'doc/files.sgml')
0 files changed, 0 insertions, 0 deletions