diff options
author | Tomás Touceda <chiiph@leap.se> | 2014-05-21 08:52:57 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2014-05-21 08:52:57 -0300 |
commit | 415b6e1f58e41ba0b66c24b6a1e93aca039a5e9f (patch) | |
tree | a5fecfaeda0f705e749de54d9c6c3bb388e5de74 /LICENSE | |
parent | 8448a42c81da482063233da48dc66a5ddcf7d13d (diff) | |
parent | 73801e0db2601301f06d388fa7e258eccf093373 (diff) |
Merge remote-tracking branch 'refs/remotes/kali/feature/fix-nameserver-restoring' into develop
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions