Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Thu, 11 Dec 2014 00:18:22 +0000 (16:18 -0800)
committerIvan Kohler <ivan@freeside.biz>
Thu, 11 Dec 2014 00:18:22 +0000 (16:18 -0800)

Trivial merge