chiark / gitweb /
Merge branch 'master' of http://git.distorted.org.uk/~mdw/profile
authorMark Wooding <mwooding@good.com>
Thu, 23 Oct 2014 12:49:12 +0000 (13:49 +0100)
committerMark Wooding <mwooding@good.com>
Thu, 23 Oct 2014 12:49:12 +0000 (13:49 +0100)
* 'master' of http://git.distorted.org.uk/~mdw/profile:
  bg/lilith.jpg: New image; painting by John Collier.
  dot/bashrc: Some hacking for Sailfish.


Trivial merge