From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 11 Dec 2014 11:47:39 +0000 (+0000)
Subject: Merge remote-tracking branch 'staging/master'
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/f2f7e6c5f0ef49bded837fa67c35fcd937ce5905?ds=inline;hp=-c

Merge remote-tracking branch 'staging/master'

* staging/master:
  bg/harley-quinn.jpg: New background image.
  setup: Sort the backgrounds by name, and reformat a little.
---

f2f7e6c5f0ef49bded837fa67c35fcd937ce5905