From: Maximilian Friedersdorff <maxf130@gmail.com>
Date: Fri, 6 May 2016 11:45:24 +0000 (+0100)
Subject: Merge branch 'master' of github.com:maxf130/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=c801d445d62d85d841ca22e0af546ef9f0821228;p=max%2Fdotfiles.git

Merge branch 'master' of github.com:maxf130/dotfiles

Conflicts:
	mutt/.mutt/muttrc
---

c801d445d62d85d841ca22e0af546ef9f0821228