Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 28 Oct 2015 18:24:46 +0000 (11:24 -0700)
committerIvan Kohler <ivan@freeside.biz>
Wed, 28 Oct 2015 18:24:46 +0000 (11:24 -0700)

Trivial merge