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)
commitf2f7e6c5f0ef49bded837fa67c35fcd937ce5905
tree9a2d1a04ad45184ec3d5208962b23e43323273a8
parent43976441a6e794447361402fda5927abf2bae851
parent9fe9138932c997fb69693ba6e9673266d09b92e3
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.