Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Thu, 7 May 2015 02:10:47 +0000 (19:10 -0700)
committerIvan Kohler <ivan@freeside.biz>
Thu, 7 May 2015 02:10:47 +0000 (19:10 -0700)

Trivial merge