Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Fri, 23 Oct 2015 23:17:51 +0000 (16:17 -0700)
committerIvan Kohler <ivan@freeside.biz>
Fri, 23 Oct 2015 23:17:51 +0000 (16:17 -0700)

Trivial merge