Merge branch 'master' into sru_2_0
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 11 Sep 2013 11:15:43 +0000 (13:15 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 11 Sep 2013 11:15:43 +0000 (13:15 +0200)
commit1f5e4f24c6e51d741e15317348bc7aef05fcc7ab
tree02f0913d2008773da9da6c949040899e770e8332
parent612ac7d30003582e44d4184c830eee7f1a1a0443
parent30257fdfae108b95848ef0ccbc4cac09466a60d8
Merge branch 'master' into sru_2_0

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