Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

Conflicts:
	test/test_http_49.res

Restore to new test result.

diff --cc test/run_pazpar2.sh
index 28e81aa,28e81aa..0dadcb1
--- 1/test/run_pazpar2.sh
--- 2/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@@ -78,6 -78,6 +78,9 @@@ for f in `cat ${srcdir}/${URLS}`; d
        OUT2=${PREFIX}_${testno}.log
        DIFF=${PREFIX}_${testno}.dif
        rm -f $OUT2 $DIFF
++      if [ -n "$DEBUG" ] ; then 
++          echo "test $testno: $f" 
++      fi
        if test -n "${postfile}"; then
            eval $POST
        else
@@@ -102,6 -102,6 +105,9 @@@
        testno=`expr $testno + 1`
        postfile=
      elif echo $f | grep '^[0-9]' >/dev/null; then
++      if [ -n "$DEBUG" ] ; then 
++          echo "Sleeping $f"
++      fi
        sleep $f
      else
        if test -f $srcdir/$f; then