Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorMark Wells <mark@freeside.biz>
Wed, 6 Jul 2016 18:48:45 +0000 (11:48 -0700)
committerMark Wells <mark@freeside.biz>
Wed, 6 Jul 2016 18:48:45 +0000 (11:48 -0700)

Trivial merge