diff options
| author | Alberto Gonzalez Iniesta <agi@inittab.org> | 2015-07-01 13:15:55 +0200 |
|---|---|---|
| committer | Alberto Gonzalez Iniesta <agi@inittab.org> | 2015-07-01 13:15:55 +0200 |
| commit | 36e6270cd1fdac93994548f1563b4f5fd5c24628 (patch) | |
| tree | 5cf1af61a6ccb24eae9c2e3e081e81c38f7e0e3f /.gitattributes | |
| parent | db0b5876a982e93446fcc2df42c16d3e2b62dcfb (diff) | |
| parent | b35ad09bfc4a26e7ea456f01596aa86576a62b3b (diff) | |
Merge branch 'jessie'
Conflicts:
debian/changelog
debian/control
debian/patches/series
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions