diff options
| author | Leif Johansson <leifj@sunet.se> | 2010-11-25 17:19:18 +0100 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2010-11-25 17:19:18 +0100 |
| commit | 9a1faee8dc63c0277558b14ba42021f20d506b2f (patch) | |
| tree | 6a0d7f00bb1b8d029a938e2a14fe969568f45c1c /swamid-edugain-testing-1.0.mxml | |
| parent | fa61fd42bd784959d47a3b6fb0e06516d7eee7a2 (diff) | |
| parent | fd8247c5f1df53189d62ae73723413446c75ec84 (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Conflicts:
swamid-1.0.mxml
Diffstat (limited to 'swamid-edugain-testing-1.0.mxml')
0 files changed, 0 insertions, 0 deletions