diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-07 20:15:52 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-07 20:15:52 +0100 |
| commit | 043d80193e507202d3e1b9456ed802940f2611d7 (patch) | |
| tree | a833993818b97b3c7689ee3e7e2771fb5600889f /COPYING.GPL | |
| parent | 37c61d76869a50110e298b042660eb5120a282c8 (diff) | |
| parent | 9f2df510b17f6b64801677915f5c25f73290d3f4 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
configure.ac
debian/changelog
Diffstat (limited to 'COPYING.GPL')
0 files changed, 0 insertions, 0 deletions