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

Trivial merge