Merge branch 'master' of md-master.swamid.se:swamid-metadata
authorLeif Johansson <leifj@sunet.se>
Wed, 18 Jan 2012 21:14:02 +0000 (22:14 +0100)
committerLeif Johansson <leifj@sunet.se>
Wed, 18 Jan 2012 21:14:02 +0000 (22:14 +0100)
commite2394bdb0922fda0713bf7207379e1603fc91946
treefc299bf89bf1318366207fa3be92284bfceb9fb8
parenta5c8e9060b9865b1f4c35fa7a09a80801a48f2db
parent0a326b0da90178067e9def973c0e9c8ee3f593e5
Merge branch 'master' of md-swamid.se:swamid-metadata