summaryrefslogtreecommitdiffstats
path: root/cholerab/knut/plugs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2011-08-13 16:21:36 +0200
committermakefu <github@syntax-fehler.de>2011-08-13 16:21:36 +0200
commit6ed646ab7a7c6eb56afad481616d50805a6925ef (patch)
treefebaa982e7c4d5c50b145ad781fae2c45346eeb3 /cholerab/knut/plugs
parent69a7689fc33e1d505c06ae81d7a782d53196da9f (diff)
parent85462282161317ba0b99a08dcd118e6172cd8b9d (diff)
Merge branch 'master' of github.com:krebscode/painload
Conflicts: cholerab/AGENDA.cccamp11
Diffstat (limited to 'cholerab/knut/plugs')
0 files changed, 0 insertions, 0 deletions