Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Fri, 5 Sep 2014 18:45:48 +0000 (11:45 -0700)
committerIvan Kohler <ivan@freeside.biz>
Fri, 5 Sep 2014 18:45:48 +0000 (11:45 -0700)

Trivial merge