From: Simon Ruderich Date: Sat, 2 Jun 2018 12:46:19 +0000 (+0200) Subject: Merge branch 'multimedia' again X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=416ce61606a742ea16b9e121b2e279416375860a;p=config%2Fdotfiles.git Merge branch 'multimedia' again Forgot a few commits in the original merge. --- 416ce61606a742ea16b9e121b2e279416375860a