diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-30 15:57:21 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-30 15:57:21 -0300 |
| commit | 83f5501364e77dfeac9fbbf67bff8ee9e63431ed (patch) | |
| tree | 04b4735ee0001b225f15563508626d62b5108e05 /data | |
| parent | 20674265220078d2476838e61f6ac0637805b456 (diff) | |
| parent | f29e099d524a39a80fc6225d3547217eefa7fc0f (diff) | |
Merge remote-tracking branch 'kali/bug/fix-naming-in-resolv-update' into develop
Diffstat (limited to 'data')
0 files changed, 0 insertions, 0 deletions