Merge branch 'master' into sru_2_0
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 27 Sep 2013 15:30:53 +0000 (17:30 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 27 Sep 2013 15:30:53 +0000 (17:30 +0200)

Trivial merge