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

Trivial merge