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

Merge branch 'multimedia' again

Forgot a few commits in the original merge.
---

416ce61606a742ea16b9e121b2e279416375860a