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)
commitf50e88ece40cd62eb9e969cd138e3f274725a991
tree0e1849e98b2bbb732e61213df71b39e42a979cc5
parentac0e4f37db910a939851b6ad6dab5876df6ceeaf
parent9eb7249e5017426eef8177f99847696e7bc95a33
Merge branch 'master' into sru_2_0

Conflicts:
src/rpn2solr.c
src/rpn2solr.c