From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 24 Feb 2014 19:51:13 +0000 (+0000)
Subject: Merge remote-tracking branch 'staging'
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/3da089939fb0017b21cd44ab95b7ea0fcf8a0090

Merge remote-tracking branch 'staging'

* staging:
  dot/emacs, el/dot-emacs.el: Introduce support for Scala.
  el/dot-emacs.el: New face `mdw-trivial-face'.
---

3da089939fb0017b21cd44ab95b7ea0fcf8a0090