Merge branch 'master' of md-master.swamid.se:swamid-metadata
authorFredrik Aslund <fredrik.aslund@umu.se>
Wed, 4 Jun 2014 14:11:41 +0000 (16:11 +0200)
committerFredrik Aslund <fredrik.aslund@umu.se>
Wed, 4 Jun 2014 14:11:41 +0000 (16:11 +0200)
commit86cf852c5a3cbd3857b16452d669bea58ecb598d
tree050199d365eb453d76c9ffc9e55f01c544be29ac
parent49e0396da536fdc8bc6a4405ee643fbf68a4231a
parent40f90519d22be6389cf95232a6153753ed75eb44
Merge branch 'master' of md-swamid.se:swamid-metadata
swamid-sp-2.0.mxml