Merge remote-tracking branch 'ms/xss' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 21 Aug 2013 15:40:44 +0000 (17:40 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 21 Aug 2013 15:40:44 +0000 (17:40 +0200)

Trivial merge