Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 9 Oct 2013 06:04:11 +0000 (23:04 -0700)
committerIvan Kohler <ivan@freeside.biz>
Wed, 9 Oct 2013 06:04:11 +0000 (23:04 -0700)

Trivial merge