Merge branch 'xss_fixes' of https://github.com/mcreenan/Freeside
authorIvan Kohler <ivan@freeside.biz>
Thu, 25 Apr 2013 11:12:22 +0000 (04:12 -0700)
committerIvan Kohler <ivan@freeside.biz>
Thu, 25 Apr 2013 11:12:22 +0000 (04:12 -0700)

Trivial merge