diff options
author | Micah Anderson <micah@riseup.net> | 2013-10-22 13:29:11 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2013-10-22 13:29:11 -0400 |
commit | f22b1a04f892857d162d87f9c9e120e7c5daadf7 (patch) | |
tree | 8998a60a2f55aa6f22a76e7aa1ec176e16f5cf33 /tox.ini | |
parent | dd907d3098c582b9e92eb181efb87453f046dcc6 (diff) | |
parent | 522b886046baf114f2b86173661e568c7c065da6 (diff) |
Merge remote-tracking branch 'kali/debian-0.3.4' into debian
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions