[emacs] epa
[mutt] Expand threads when going back to inbox
[.gitignore] +icedtea-web
Merge branch 'master' of ssh://weshyo.mine.nu/home/seb/git/config-base
.
[emacs] max-level=2 for refiling in org-mode
Merge branch 'master' of /home/seb/git/config-base
[emacs] packages
.
[emacs] Clean-up
[emacs] Let me kill MERGE_MSG buffers if I feel like it

  * I only care for the formatting/font-highlighting
[emacs] Aaaah, emacs regexes...