Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Tue, 18 Nov 2014 22:31:39 +0000 (14:31 -0800)
committerIvan Kohler <ivan@freeside.biz>
Tue, 18 Nov 2014 22:31:39 +0000 (14:31 -0800)

Trivial merge