Merge branch 'master' of https://github.com/systemed/potlatch2
authorRichard Fairhurst <richard@systemeD.net>
Mon, 14 May 2012 10:21:10 +0000 (11:21 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Mon, 14 May 2012 10:21:10 +0000 (11:21 +0100)

Trivial merge