Merge branch 'master' of md-master.swamid.se:swamid-metadata
authorLeif Johansson <leifj@sunet.se>
Wed, 9 Jul 2014 08:21:02 +0000 (10:21 +0200)
committerLeif Johansson <leifj@sunet.se>
Wed, 9 Jul 2014 08:21:02 +0000 (10:21 +0200)

Trivial merge