Merge branch 'master' into paz-927 paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 12 Aug 2015 13:43:51 +0000 (15:43 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 12 Aug 2015 13:43:51 +0000 (15:43 +0200)
commit4b259026074c2fb5931eac168a64e8df0be46e30
treebb9bb18bebace83d7b4a30bae73c3639c3eccfea
parent7f0b4d88eca113e5eb0beac2046180e9ff9d08ea
parentccb49eae33fe080c2a184b7ccf67ad32bda3e446
Merge branch 'master' into paz-927
src/client.c
src/client.h
src/pazpar2_config.c
src/pazpar2_config.h
src/session.c
test/test_limit_limitmap.urls
win/makefile