summaryrefslogtreecommitdiffstats
path: root/retiolum/hosts/krebsbob
diff options
context:
space:
mode:
authorFelix Richter <Felix.Richter@syntax-fehler.de>2011-05-29 14:25:46 +0200
committerFelix Richter <Felix.Richter@syntax-fehler.de>2011-05-29 14:25:46 +0200
commite4995d47bb9906979de05113e740ba18d82b75da (patch)
tree7f97ed9d75460487578c23133d8bb2f64d4711a1 /retiolum/hosts/krebsbob
parent80a24e4b93572a559ed5b12030d600405effb590 (diff)
parent12f753880b610de6728b6331f2c1052c7e33901a (diff)
Merge branch 'master' of github.com:krebscode/hosts
Conflicts: krebsbob = recovered from fuckup
Diffstat (limited to 'retiolum/hosts/krebsbob')
0 files changed, 0 insertions, 0 deletions