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

Trivial merge