Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Fri, 5 Dec 2014 22:24:07 +0000 (14:24 -0800)
committerIvan Kohler <ivan@freeside.biz>
Fri, 5 Dec 2014 22:24:07 +0000 (14:24 -0800)

Trivial merge