Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Fri, 15 May 2015 18:41:24 +0000 (11:41 -0700)
committerIvan Kohler <ivan@freeside.biz>
Fri, 15 May 2015 18:41:24 +0000 (11:41 -0700)

Trivial merge