Merge branch 'master' into rewrite-filter
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 19 Jun 2013 08:26:59 +0000 (10:26 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 19 Jun 2013 08:26:59 +0000 (10:26 +0200)

Trivial merge