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

Trivial merge