Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Fri, 31 May 2013 19:59:40 +0000 (12:59 -0700)
committerIvan Kohler <ivan@freeside.biz>
Fri, 31 May 2013 19:59:40 +0000 (12:59 -0700)

Trivial merge