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

Trivial merge