Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorMark Wells <mark@freeside.biz>
Thu, 27 Aug 2015 21:47:03 +0000 (14:47 -0700)
committerMark Wells <mark@freeside.biz>
Thu, 27 Aug 2015 21:47:43 +0000 (14:47 -0700)

Trivial merge