Merge branch 'master' into sru_2_0
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 26 Sep 2013 13:10:10 +0000 (15:10 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 26 Sep 2013 13:10:10 +0000 (15:10 +0200)

Trivial merge