Merge branch 'master' into sru_2_0
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 19 Sep 2013 19:02:18 +0000 (21:02 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 19 Sep 2013 19:02:18 +0000 (21:02 +0200)

Trivial merge