Merge branch 'master' of md-master.swamid.se:swamid-metadata
authorPaul Scott <paul.scott@kau.se>
Fri, 10 Apr 2015 12:48:12 +0000 (14:48 +0200)
committerPaul Scott <paul.scott@kau.se>
Fri, 10 Apr 2015 12:48:12 +0000 (14:48 +0200)
commite11548b97fc040c117a5a0a9cde9899282414f9b
tree3938440bd814b06296451ee7770b3c38d0f6118e
parent17ee584bd286dd9b15f2a17c0687ea60b67dc620
parentaa24e34df00e422904c6e3e06cd34f40dd859d0e
Merge branch 'master' of md-swamid.se:swamid-metadata