Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorJonathan Prykop <jonathan@freeside.biz>
Mon, 7 Dec 2015 23:47:59 +0000 (17:47 -0600)
committerJonathan Prykop <jonathan@freeside.biz>
Mon, 7 Dec 2015 23:47:59 +0000 (17:47 -0600)

Trivial merge