diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-11-07 00:14:53 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-11-07 00:14:53 +0000 |
| commit | 641eeadd77583420e7ad32d6a0414a24f4fc83bb (patch) | |
| tree | ce8800f1d680c667e398265865de79e3922a49d4 /.gitignore | |
| parent | e7bf758b02322662a888d347d13243501d109b74 (diff) | |
| parent | 631c9e09a7fd22a5847173978c3d1357c1db74ea (diff) | |
Merge branch 'master' into wip.remote
Conflicts:
debian/changelog
dgit
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions