Merge branch 'master' into sru_2_0
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 11 Sep 2013 13:29:45 +0000 (15:29 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 11 Sep 2013 13:29:45 +0000 (15:29 +0200)
commit9bca108ddbc555efaffb85dda76581eaeed44b4e
tree44bef55ec5fa12c0bcff86bd5575814cddc23af3
parent1f5e4f24c6e51d741e15317348bc7aef05fcc7ab
parent6be82a6e9dc3eb84877ddcc2d86d70ce9f539e7c
Merge branch 'master' into sru_2_0

Conflicts:
IDMETA
debian/changelog
debian/changelog
src/rpn2solr.c