Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Fri, 10 Apr 2015 16:33:56 +0000 (09:33 -0700)
committerIvan Kohler <ivan@freeside.biz>
Fri, 10 Apr 2015 16:33:56 +0000 (09:33 -0700)

Trivial merge