From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 20 May 2008 14:35:46 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/7dc60134593155f247776c7a31cdc3a3a007f565

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.
---

7dc60134593155f247776c7a31cdc3a3a007f565