diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-06-13 16:59:33 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-06-13 16:59:33 +0200 |
| commit | 03754659d6381ac95d4d5e8dc612d3ad6865b581 (patch) | |
| tree | 0e7339c5937c5d6e3ce44538ddeb83d1e9cfdcfb /debian/templates | |
| parent | 3482cc3995b86f0f053a7e010f82451de292a266 (diff) | |
| parent | a3f643fc9d8fc4b45c1bed3cfa8415afb9eb3873 (diff) | |
Merge branch 'master' of git://git.kitenet.net/etckeeper into bzrplugin
Conflicts:
debian/changelog
Diffstat (limited to 'debian/templates')
0 files changed, 0 insertions, 0 deletions