summaryrefslogtreecommitdiff
path: root/swamid-testing-1.0.mxml
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-06-09 17:59:18 +0200
committerLeif Johansson <leifj@sunet.se>2011-06-09 17:59:18 +0200
commit41820db4f58341575b776570c0e138d79552d156 (patch)
tree10adf94559697c8eace6faaa63676fb076d10feb /swamid-testing-1.0.mxml
parentcff06b3d1692b965abb45a542405c65af23137b2 (diff)
parentec2dc19be2988b18a461cabf9c75d736ae2789a6 (diff)
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Conflicts: swamid-1.0.mxml
Diffstat (limited to 'swamid-testing-1.0.mxml')
0 files changed, 0 insertions, 0 deletions