Merge branch 'master' of git.ganneff.de:emacs
authorJoerg Jaspert <joerg@debian.org>
Sun, 3 May 2015 21:03:58 +0000 (23:03 +0200)
committerJoerg Jaspert <joerg@debian.org>
Sun, 3 May 2015 21:03:58 +0000 (23:03 +0200)
commitd2422fa85f1e2f81341517c5aa334e4908452ca2
tree497d786199400f8ff782bb2bb98d11d5fa882c79
parent61a98799ea091c47dfc5b8a5a2118c4ccfd2d288
parent02f84e0833e0c2a41b575c176c69c245eddc6dcb
Merge branch 'master' of git.ganneff.de:emacs

* 'master' of git.ganneff.de:emacs:
  new user format functions
  Updates
  No longer protect gnus buffer
  Update solarized theme