Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorMark Wells <mark@freeside.biz>
Thu, 28 May 2015 23:58:47 +0000 (16:58 -0700)
committerMark Wells <mark@freeside.biz>
Thu, 28 May 2015 23:58:47 +0000 (16:58 -0700)

Trivial merge