Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sat, 7 Nov 2015 20:32:06 +0000 (12:32 -0800)
committerIvan Kohler <ivan@freeside.biz>
Sat, 7 Nov 2015 20:32:06 +0000 (12:32 -0800)

Trivial merge