chiark / gitweb /
Merge remote-tracking branch 'staging/master'
authorMark Wooding <mdw@distorted.org.uk>
Thu, 11 Dec 2014 11:47:39 +0000 (11:47 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Thu, 11 Dec 2014 11:47:39 +0000 (11:47 +0000)
* staging/master:
  bg/harley-quinn.jpg: New background image.
  setup: Sort the backgrounds by name, and reformat a little.


Trivial merge