Merge branch 'master' of md-master.swamid.se:swamid-metadata
authorFredrik Åslund <fredrik.aslund@umu.se>
Wed, 29 May 2013 05:51:38 +0000 (07:51 +0200)
committerFredrik Åslund <fredrik.aslund@umu.se>
Wed, 29 May 2013 05:51:38 +0000 (07:51 +0200)
commitb76474bb8f3a8864e70ec433ce32385210146f5a
tree4ed157f8652eb368efea381263f243a1eaddbbd9
parent086530fdc2ad2fa06a3482dc469e08990690882f
parent4eea17469366143f277688b8edae06c8cf236741
Merge branch 'master' of md-swamid.se:swamid-metadata

Conflicts:
swamid-sp-2.0.mxml
swamid-sp-2.0.mxml