diff options
| author | Fredrik Åslund <fredrik.aslund@umu.se> | 2013-07-02 15:45:05 +0200 |
|---|---|---|
| committer | Fredrik Åslund <fredrik.aslund@umu.se> | 2013-07-02 15:45:05 +0200 |
| commit | b5900214be5e15fc5b839b39dcf710b46088e697 (patch) | |
| tree | 35a47cbe70c8e82c108a9db96073f8bc894b69bb /swamid-1.0 | |
| parent | f99687b4cc911dbc2e07cbf7e62fd43ccb060a95 (diff) | |
| parent | f7726cc3717fdc943196d70580a44351b192f7aa (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Conflicts:
swamid-sp-2.0.mxml
Diffstat (limited to 'swamid-1.0')
0 files changed, 0 insertions, 0 deletions