Merge branch 'master' of md-master.swamid.se:swamid-metadata
authorLeif Johansson <leifj@sunet.se>
Thu, 2 Dec 2010 08:49:28 +0000 (09:49 +0100)
committerLeif Johansson <leifj@sunet.se>
Thu, 2 Dec 2010 08:49:28 +0000 (09:49 +0100)
commitfa803e6214f4c0452ee26b634e6dbc1b922b7432
tree8225ac123d30d90ccf36e02ecf0bf16fa9120139
parent7fa13e90bb7c21d444248e77d9a885dbd7ce3bb1
parent683b44ebedfd49f8b4b061bc6e73c74ba3feeb6c
Merge branch 'master' of md-swamid.se:swamid-metadata
swamid-1.0.mxml