Merge branch 'master' of github.com:systemed/potlatch2
authorRichard Fairhurst <richard@systemeD.net>
Mon, 28 Sep 2015 06:44:33 +0000 (07:44 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Mon, 28 Sep 2015 06:44:33 +0000 (07:44 +0100)

Trivial merge