Merge branch 'master' into sru_2_0
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 18 Sep 2013 12:49:06 +0000 (14:49 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 18 Sep 2013 12:49:06 +0000 (14:49 +0200)

Trivial merge