Merge branch 'ranking-h' of ssh://git.indexdata.com:222/home/git/pub/pazpar2 into...
authorHeikki Levanto <heikki@indexdata.dk>
Wed, 4 Dec 2013 11:58:56 +0000 (12:58 +0100)
committerHeikki Levanto <heikki@indexdata.dk>
Wed, 4 Dec 2013 11:59:16 +0000 (12:59 +0100)
commit4e7c5a2a359970dddb74662257b9946044d525a0
tree3585b9f4b852747bf729c88affdcb33859097ca7
parentde6338ddb87c9c46cf1b26998cb4e340e4844395
parent167d995add67a666df5f91bbe58a3f9084c77453
Merge branch 'ranking-h' of ssh://git.indexdata.com:222/home/git/pub/pazpar2 into ranking-h

Conflicts:
heikki/solr/test3.sh
src/relevance.c
Also fixed a detail with sorting of the score numbers
heikki/solr/test3.sh
src/relevance.c