Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Fri, 7 Nov 2014 00:49:30 +0000 (16:49 -0800)
committerIvan Kohler <ivan@freeside.biz>
Fri, 7 Nov 2014 00:49:30 +0000 (16:49 -0800)

Trivial merge