From: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date: Thu, 22 Jul 2010 15:16:56 +0000 (+0200)
Subject: Merge branch 'xss-fix'
X-Git-Tag: v2.6~104
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=8b4080e1e5a0ed07054ee98401bfbdf239aab455;p=libi2ncommon

Merge branch 'xss-fix'
---

8b4080e1e5a0ed07054ee98401bfbdf239aab455