Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile
authorMark Wooding <mdw@distorted.org.uk>
Tue, 20 May 2008 14:35:46 +0000 (15:35 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 20 May 2008 14:35:46 +0000 (15:35 +0100)
commit7dc60134593155f247776c7a31cdc3a3a007f565
tree3afb513e950d93c71bc36759d310ab737d17f665
parent162d33499592d12d7c9f44c1a66f40b073eef16b
parent9958af687919060c7a5cc7a3ae1c3971b9f74a4f
Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile

* 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile:
  emacs: Turn on mark-even-if-inactive.
  emacs: Add Timesheet magic.
  emacs: Local configuration files.
emacs