tree 68c146645083bea90c241359d4d081b57c66a670
parent 7a94722e522752a7981201aad5540e54d4da18d5
parent 5ba719785afd6823632864cd851c1373bbf006c9
author Darius Jokilehto <dariusjokilehto+os@gmail.com> 1694001759 +0100
committer Darius Jokilehto <dariusjokilehto+os@gmail.com> 1694001848 +0100

Merge branch 'stable-3.4'

* stable-3.4:
  Add missing copyright header to SamlWebFilterIT.java
  Remove httpDisplaynameHeader config option
  Support display names with non-ISO-8859-1 characters

Change-Id: I80f3619e05364f9bc2eef1df2194e98596b219f3