From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 21 Aug 2013 15:40:44 +0000 (+0200)
Subject: Merge remote-tracking branch 'ms/xss' into next
X-Git-Tag: v2.13-core73~32
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=df05a856cdc5044398284b1a8dc704b22dfca911;hp=-c

Merge remote-tracking branch 'ms/xss' into next
---

df05a856cdc5044398284b1a8dc704b22dfca911