Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/skel
authorMark Wooding <mdw@distorted.org.uk>
Thu, 5 Sep 2019 12:30:15 +0000 (13:30 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Thu, 5 Sep 2019 12:30:15 +0000 (13:30 +0100)
commita590b3b49392d71c2f6bebcdb6343e5050a1cf73
tree6ee150d064d1954fdb13d255ab2ce6ee5359fd37
parent68abf7656488f116dcc2ebc992358ede59d49310
parenta20fd6eae48a7a0b919bb87c765442c1151baf39
Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/skel

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/skel:
  Release 1.3.2.
  skelrc.sod: Add skeleton for Sod.

Conflicts:
debian/changelog -- two 1.3.2 releases!
Makefile.am
debian/changelog