diff options
author | Jonas <dr@jones.dk> | 2011-05-18 19:58:53 +0200 |
---|---|---|
committer | Jonas <dr@jones.dk> | 2011-05-18 19:58:53 +0200 |
commit | a0e60be0d98db36be4c21a04ff897f9b3d1bf3dd (patch) | |
tree | e79f350194ac955ca626924d32d78104d7db5057 /bind/fake-222/JONES-nomail | |
parent | 683354aff6ed39d1723a5a04aafe4bafd454788c (diff) | |
parent | bc5a6f489de8ffdfc8e0913a50e97a2fdc1aaf44 (diff) |
Merge branch 'master' of git://source.jones.dk/local-JONES.DK
Conflicts:
bind/fake-222/jones.dk
Diffstat (limited to 'bind/fake-222/JONES-nomail')
0 files changed, 0 insertions, 0 deletions