Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Tue, 27 Oct 2015 16:40:59 +0000 (09:40 -0700)
committerIvan Kohler <ivan@freeside.biz>
Tue, 27 Oct 2015 16:40:59 +0000 (09:40 -0700)

Trivial merge