Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Mon, 2 Jun 2014 22:56:11 +0000 (15:56 -0700)
committerIvan Kohler <ivan@freeside.biz>
Mon, 2 Jun 2014 22:56:11 +0000 (15:56 -0700)

Trivial merge