diff options
| author | Fredrik Åslund <fredrik.aslund@umu.se> | 2013-05-29 07:51:38 +0200 |
|---|---|---|
| committer | Fredrik Åslund <fredrik.aslund@umu.se> | 2013-05-29 07:51:38 +0200 |
| commit | b76474bb8f3a8864e70ec433ce32385210146f5a (patch) | |
| tree | 4ed157f8652eb368efea381263f243a1eaddbbd9 /swamid-1.0/nya-36.ladok.umu.se-aws-sp-en.xml | |
| parent | 086530fdc2ad2fa06a3482dc469e08990690882f (diff) | |
| parent | 4eea17469366143f277688b8edae06c8cf236741 (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Conflicts:
swamid-sp-2.0.mxml
Diffstat (limited to 'swamid-1.0/nya-36.ladok.umu.se-aws-sp-en.xml')
0 files changed, 0 insertions, 0 deletions