summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-06-05 06:26:49 +0900
committerKali Kaneko <kali@leap.se>2013-06-05 06:26:49 +0900
commitb4043c402c09ec82bb156ecd9d0738887bd33b86 (patch)
tree71d8fc9cde7addd54a442f9d4ce23d870f46777f /src
parentb42e4e575ae1669f960adada602f2c2c939ed548 (diff)
parent395787d20208c439797855313cc9bbb7fb76784a (diff)
Merge remote-tracking branch 'micah/debian' into debian
Conflicts: debian/control debian/rules setup.py
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions