Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Thu, 20 Dec 2012 20:06:26 +0000 (12:06 -0800)
committerIvan Kohler <ivan@freeside.biz>
Thu, 20 Dec 2012 20:06:26 +0000 (12:06 -0800)

Trivial merge