Merge branch 'master' into protocol-version2
authorDennis Schafroth <dennis@indexdata.com>
Wed, 25 Apr 2012 10:40:03 +0000 (12:40 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Wed, 25 Apr 2012 10:40:03 +0000 (12:40 +0200)
commit02285d44c6c35b401313d6c148db918b3edaaebf
tree2fafe862fe1a8d3d5fdae7fedf9279196743b577
parent2b4eb014c7252177ca1a4400a226182e8db4fb2e
parent5198fb74b80b8650527e5e4957c4363a338a0346
Merge branch 'master' into protocol-version2

Test re-write in master

Conflicts:
test/Makefile.am
test/test_solr_4.res
test/test_solr_5.res
.cproject
test/Makefile.am