Merge branch 'master' into sru_2_0
authorAdam Dickmeiss <adam@indexdata.dk>
Sun, 22 Sep 2013 16:18:28 +0000 (18:18 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Sun, 22 Sep 2013 16:18:28 +0000 (18:18 +0200)
Conflicts:
src/rpn2solr.c


No differences found