Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Thu, 21 Feb 2013 04:10:34 +0000 (20:10 -0800)
committerIvan Kohler <ivan@freeside.biz>
Thu, 21 Feb 2013 04:10:34 +0000 (20:10 -0800)

Trivial merge