From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 25 Jun 2011 13:25:49 +0000 (+0100)
Subject: Merge remote-tracking branches 'distorted/master' and 'ponder/master'
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/a33d1f8ca747f70deefcd57d2d51876a0f6f9c1c?hp=a33d1f8ca747f70deefcd57d2d51876a0f6f9c1c

Merge remote-tracking branches 'distorted/master' and 'ponder/master'

* distorted/master:
  bin/mdw-conf, dot/bashrc, setup: Portability fixes.

* ponder/master:
  dot/lisp-init.lisp: Make sure that ASDF is available.
---