Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Thu, 17 Jun 2010 15:19:34 +0000 (17:19 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Thu, 17 Jun 2010 15:19:34 +0000 (17:19 +0200)
commit9a29dfe185cbcbec55a5ca0a3c491b03ff45222f
tree7b1a67c5e9001a29ec9f52b303eb0dd1c82f444c
parent84a59bac11f3eece56bb0f4cf107dcd462798cea
parent0b98fc3f38dc8d6d789f0e0746d79e342ea05687
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

Conflicts:
test/test_http_49.res

Restore to new test result.
test/run_pazpar2.sh