diff options
| author | Felix Richter <Felix.Richter@syntax-fehler.de> | 2011-05-10 21:08:59 +0200 |
|---|---|---|
| committer | Felix Richter <Felix.Richter@syntax-fehler.de> | 2011-05-10 21:08:59 +0200 |
| commit | 135fcee283288985e825181ebcfcae359e4975c8 (patch) | |
| tree | 88dd18bec97727687d970a82c97a0eff4780512b /hosts/miefdat | |
| parent | d14a56d2ac17233dcadac87ecab090b26f8d7150 (diff) | |
| parent | b54e30f1d4b37f9b01be4434d6b03e6301c46e14 (diff) | |
Merge remote-tracking branch 'oldrepo/master'
Conflicts:
krebs: newline deleted
miefdahome: local net deleted
supernode: replaced ip with dns entry
Diffstat (limited to 'hosts/miefdat')
0 files changed, 0 insertions, 0 deletions