Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Fri, 8 Feb 2013 05:12:22 +0000 (21:12 -0800)
committerIvan Kohler <ivan@freeside.biz>
Fri, 8 Feb 2013 05:12:22 +0000 (21:12 -0800)

Trivial merge