Merge branch 'master' of github.com:systemed/potlatch2
authorRichard Fairhurst <richard@systemeD.net>
Sun, 19 Mar 2017 18:35:04 +0000 (18:35 +0000)
committerRichard Fairhurst <richard@systemeD.net>
Sun, 19 Mar 2017 18:35:04 +0000 (18:35 +0000)

Trivial merge