Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sun, 3 Mar 2013 07:36:31 +0000 (23:36 -0800)
committerIvan Kohler <ivan@freeside.biz>
Sun, 3 Mar 2013 07:36:31 +0000 (23:36 -0800)

Trivial merge