Merge remote-tracking branch 'ponder/master'
authorMark Wooding <mdw@distorted.org.uk>
Fri, 11 Nov 2011 17:57:13 +0000 (17:57 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 11 Nov 2011 17:57:13 +0000 (17:57 +0000)
commitc40c5499d5082b481d7b87160d313dc2bf22f728
tree5262c8dd0b2c258d2f668f9d6243e890d82bc1ab
parentc60cbbe8c902c3bd56a093e5479de4f7855e464f
parentf8faccdad41b570886600b89b2da5084dfd285f0
Merge remote-tracking branch 'ponder/master'

* ponder/master:
  dot/emacs: Fix awful calendar snafu.
  el/dot-emacs.el: Define org-mode variables to make Docbook output work.
  dot/e16-bindings: New bindings for fiddling with window opacity.
dot/emacs