diff options
| author | Joey Hess <joey@kitenet.net> | 2011-05-20 12:24:36 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-05-20 12:24:36 -0400 |
| commit | 3bcad664b0fe6c05ffd363f408b6bae7b06aa1ec (patch) | |
| tree | 7180db0d0d9d588598edbb4ae451a58760f4d42d /.gitignore | |
| parent | 0c1544678c59d41bde16b893bc590360b20ff749 (diff) | |
| parent | f957b3b90f103a1468fa499a88eb3d2357367f3c (diff) | |
| download | debootstrap-3bcad664b0fe6c05ffd363f408b6bae7b06aa1ec.tar.gz | |
Merge branch 'new'
Conflicts:
debian/changelog
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions