summaryrefslogtreecommitdiffstats
path: root/Zhosts/sokrates
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-08-14 15:51:29 +0200
committertv <tv@shackspace.de>2015-08-14 15:51:29 +0200
commitb8b2575d8313cfd0696a121cee1b8738faff6638 (patch)
treeb4e2d4f838da343a50cf6cfbe39eefc32813e6c0 /Zhosts/sokrates
parentc950117e0ce7b4d038f613475066a2cdb0e592e3 (diff)
parentf36177cf91fa7db20f7e30e84910fb9efd82b975 (diff)
Merge remote-tracking branch 'mors/master'
Diffstat (limited to 'Zhosts/sokrates')
0 files changed, 0 insertions, 0 deletions