Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Fri, 19 Apr 2013 03:39:27 +0000 (20:39 -0700)
committerIvan Kohler <ivan@freeside.biz>
Fri, 19 Apr 2013 03:39:27 +0000 (20:39 -0700)

Trivial merge