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

Trivial merge