Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Mon, 21 May 2012 11:27:27 +0000 (11:27 +0000)
committerDennis Schafroth <dennis@indexdata.com>
Mon, 21 May 2012 11:27:27 +0000 (11:27 +0000)
commit7d103e1dcbb332af2b4dd725cd7689057eed0092
treefdddc25aa960e6184ceb70ab0c24f03e2d21f8a4
parentc954ae325b346bc04e9b2288148cc57ac499cfb3
parentd210f4b186042051960089ed13533672e03d9e72
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

Conflicts:
test/test_limit_limitmap.urls
src/pazpar2_config.c
src/settings.c
src/settings.h
test/test_limit_limitmap_4.xml
test/test_limit_limitmap_settings_3.xml
test/test_limit_limitmap_settings_4.xml
test/test_solr.urls