diff options
| author | Leif Johansson <leifj@sunet.se> | 2011-06-09 17:59:18 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2011-06-09 17:59:18 +0200 |
| commit | 41820db4f58341575b776570c0e138d79552d156 (patch) | |
| tree | 10adf94559697c8eace6faaa63676fb076d10feb /swamid-1.0/nb11.ladok.umu.se-aws-sp.xml | |
| parent | cff06b3d1692b965abb45a542405c65af23137b2 (diff) | |
| parent | ec2dc19be2988b18a461cabf9c75d736ae2789a6 (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Conflicts:
swamid-1.0.mxml
Diffstat (limited to 'swamid-1.0/nb11.ladok.umu.se-aws-sp.xml')
0 files changed, 0 insertions, 0 deletions