Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Mon, 20 Oct 2014 20:00:43 +0000 (13:00 -0700)
committerIvan Kohler <ivan@freeside.biz>
Mon, 20 Oct 2014 20:00:43 +0000 (13:00 -0700)

Trivial merge