Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorMark Wells <mark@freeside.biz>
Thu, 28 Apr 2016 20:14:10 +0000 (13:14 -0700)
committerMark Wells <mark@freeside.biz>
Thu, 28 Apr 2016 20:14:10 +0000 (13:14 -0700)

Trivial merge