Merge branch 'master' into sru_2_0
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 24 Sep 2013 17:21:10 +0000 (19:21 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 24 Sep 2013 17:21:10 +0000 (19:21 +0200)

Trivial merge