Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Thu, 4 Dec 2014 22:47:54 +0000 (14:47 -0800)
committerIvan Kohler <ivan@freeside.biz>
Thu, 4 Dec 2014 22:47:54 +0000 (14:47 -0800)

Trivial merge