Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Thu, 4 Jun 2015 21:03:23 +0000 (14:03 -0700)
committerIvan Kohler <ivan@freeside.biz>
Thu, 4 Jun 2015 21:03:23 +0000 (14:03 -0700)

Trivial merge