diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-09-17 22:18:19 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-09-17 22:18:19 +0200 |
| commit | d667daf3e6ba5bfc7feb8a5ed0a0bd2d1febde4d (patch) | |
| tree | dccdc5cb6ec9abb557f9df152b76693efdb58c41 /doc/docbook-text-style.xsl | |
| parent | 0e510b0f46350480852b22b966601aaae8cef52f (diff) | |
| parent | e438bafe7d578a04837c520ca5d69f38a6b993cf (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'doc/docbook-text-style.xsl')
0 files changed, 0 insertions, 0 deletions