diff options
| author | Kali Kaneko <kali@leap.se> | 2013-06-05 06:26:49 +0900 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-06-05 06:26:49 +0900 |
| commit | b4043c402c09ec82bb156ecd9d0738887bd33b86 (patch) | |
| tree | 71d8fc9cde7addd54a442f9d4ce23d870f46777f /.gitignore | |
| parent | b42e4e575ae1669f960adada602f2c2c939ed548 (diff) | |
| parent | 395787d20208c439797855313cc9bbb7fb76784a (diff) | |
Merge remote-tracking branch 'micah/debian' into debian
Conflicts:
debian/control
debian/rules
setup.py
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions