| commit | 2bd9b9eb64c6b94b562dd0413ad5a6d38b752f59 | |
| author | Pierre Habouzit <madcoder@debian.org> | |
| Thu, 22 Nov 2007 00:29:16 +0000 (22 01:29 +0100) | ||
| committer | Pierre Habouzit <madcoder@debian.org> | |
| Thu, 22 Nov 2007 00:29:16 +0000 (22 01:29 +0100) | ||
| tree | bc33ad2ca8d6ed96f6c22d895504e2d589a3a17b | treesnapshot (tar.gz zip) |
| parent | 008f26fbe92d81a256d66e4c0f60f294ce8d7fb9 | commitdiff |
| parent | 324d1389b22edfa1dfdfbe69086b12d7cdb414a2 | commitdiff |
Merge branch 'debian-sid' into debian-etch
Conflicts:
debian/changelog
Conflicts:
debian/changelog
| debian/changelog | diff1 | diff2 | blobhistory |