Merge branch 'master' into sru_2_0
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 20 Sep 2013 09:07:15 +0000 (11:07 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 20 Sep 2013 09:07:15 +0000 (11:07 +0200)

Trivial merge