Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Fri, 6 Mar 2015 01:30:46 +0000 (17:30 -0800)
committerIvan Kohler <ivan@freeside.biz>
Fri, 6 Mar 2015 01:30:46 +0000 (17:30 -0800)

Trivial merge