summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2012-06-18 13:59:02 +0200
committerLeif Johansson <leifj@sunet.se>2012-06-18 13:59:02 +0200
commitc2b1676c4353a57adb0fce66ae654e35c38e6073 (patch)
tree4a3fa3761c67bc0d72cf6318f2ddec808e048a29
parentd5d041e7db207ce201ba5c343da492e7c475e39d (diff)
parent90a31f0d2bf118c17185af0cdbb203d2b9d18b38 (diff)
Merge branch 'master' of md-master.swamid.se:swamid-metadata
-rw-r--r--swamid-1.0/vmidgw.miun.se.xml4
-rw-r--r--swamid-1.0/vmidgw3.miun.se.xml4
2 files changed, 4 insertions, 4 deletions
diff --git a/swamid-1.0/vmidgw.miun.se.xml b/swamid-1.0/vmidgw.miun.se.xml
index 5f632986..9054d0f3 100644
--- a/swamid-1.0/vmidgw.miun.se.xml
+++ b/swamid-1.0/vmidgw.miun.se.xml
@@ -106,8 +106,8 @@ EwQmOmY1IlHM1SSucXdJpfVc1epYD/s2fOyy+orDvK8Gh1wO7nYByGrS14Vl/gkx
</AttributeAuthorityDescriptor>
<Organization>
- <OrganizationName xml:lang="en">MIUN</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Mittuniversitetet</OrganizationDisplayName>
+ <OrganizationName xml:lang="en">MIUNold</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Mittuniversitetet (old)</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.miun.se</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
diff --git a/swamid-1.0/vmidgw3.miun.se.xml b/swamid-1.0/vmidgw3.miun.se.xml
index 852baae1..5353c334 100644
--- a/swamid-1.0/vmidgw3.miun.se.xml
+++ b/swamid-1.0/vmidgw3.miun.se.xml
@@ -93,8 +93,8 @@ I7yfePa+lbSSpUv1l32U1dXAI6n54O9jK+ZVGubhDe0PT1Y23j/HHPbZoQ==
</AttributeAuthorityDescriptor>
<Organization>
- <OrganizationName xml:lang="en">MIUNtest</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Mittuniversitetet (test)</OrganizationDisplayName>
+ <OrganizationName xml:lang="en">MIUN</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Mittuniversitetet</OrganizationDisplayName>
<OrganizationURL xml:lang="en">http://www.miun.se</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">