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)

Trivial merge