From: Mark Wooding Date: Thu, 23 Oct 2014 12:49:12 +0000 (+0100) Subject: Merge branch 'master' of http://git.distorted.org.uk/~mdw/profile X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/21237a6865c473d89123b9649988dd610ee89074 Merge branch 'master' of git.distorted.org.uk/~mdw/profile * 'master' of http://git.distorted.org.uk/~mdw/profile: bg/lilith.jpg: New image; painting by John Collier. dot/bashrc: Some hacking for Sailfish. --- 21237a6865c473d89123b9649988dd610ee89074