Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sun, 3 Feb 2013 20:27:46 +0000 (12:27 -0800)
committerIvan Kohler <ivan@freeside.biz>
Sun, 3 Feb 2013 20:27:46 +0000 (12:27 -0800)

Trivial merge