Merge branch 'master' of git.ganneff.de:emacs
authorJoerg Jaspert <joerg.jaspert@dlh.de>
Thu, 3 Nov 2016 10:03:26 +0000 (11:03 +0100)
committerJoerg Jaspert <joerg.jaspert@dlh.de>
Thu, 3 Nov 2016 10:03:26 +0000 (11:03 +0100)
commit7637fb49896c5a8c0aed932075914ad7b3ae39b5
tree44fc776ff5a91178a35a68a8d4490ceef4c07db4
parent04fb23964831c4f449619c8568671f66c68b94ee
parentb24a5f55293d614f3ecbe813db24a4ccf3825dbb
Merge branch 'master' of git.ganneff.de:emacs

* 'master' of git.ganneff.de:emacs:
  Remove unused var
  Fixup
  Loads of updates
  fix unknown variable
  fixups
  Schema validate the config

Conflicts:
.emacs.d/config/emacs.org
.emacs.d/config/emacs.org