Merge remote-tracking branch 'staging'
authorMark Wooding <mdw@distorted.org.uk>
Mon, 24 Feb 2014 19:51:13 +0000 (19:51 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 24 Feb 2014 19:51:13 +0000 (19:51 +0000)
commit3da089939fb0017b21cd44ab95b7ea0fcf8a0090
tree08902695da62d21223edd94740af932053ecfb1c
parent9adf6847687752fcc0b63380fe0a7b0b54268f7b
parentee7c3dea8fe987cd50c99f82b168db1de6db4cd7
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'.