summaryrefslogtreecommitdiffstats
path: root/modules/retiolum/hosts/pornocauster
diff options
context:
space:
mode:
authorroot <root@krebs>2011-05-27 02:20:02 +0200
committerroot <root@krebs>2011-05-27 02:20:02 +0200
commita6563e5a9c554aa5d08c11f645815fb25deb8bcd (patch)
tree018ebffdbb800cc8ad170653bdfb0665f8ac7398 /modules/retiolum/hosts/pornocauster
parent5cbbac4c4ade45524085983625206e2be91b8e3f (diff)
parentd2ce18954f19edccf23dddf76c737cd76ca7881e (diff)
Merge branch 'import-miefda-retiolum'
Conflicts: modules/retiolum/scripts/tinc_setup/build_arch.sh modules/retiolum/scripts/tinc_setup/build_ec2.sh modules/retiolum/scripts/tinc_setup/build_no.de.sh modules/retiolum/scripts/tinc_setup/install.sh
Diffstat (limited to 'modules/retiolum/hosts/pornocauster')
0 files changed, 0 insertions, 0 deletions