Merge branch 'master' into paz-927

diff --cc src/client.c
Simple merge

diff --cc src/client.h
Simple merge

diff --cc src/connection.c
Simple merge

diff --cc src/pazpar2_config.c
Simple merge

diff --cc src/pazpar2_config.h
index a5f4a81,1343790..ab10abd
--- 1/src/pazpar2_config.h
--- 2/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@@ -153,9 -154,10 +153,9 @@@ struct conf_serve
      struct conf_config *config;
      http_server_t http_server;
      iochan_man_t iochan_man;
 -    database_hosts_t database_hosts;
  };
  
- struct conf_config *config_create(const char *fname, int verbose);
+ struct conf_config *config_create(const char *fname);
  void config_destroy(struct conf_config *config);
  void config_process_events(struct conf_config *config);
  void info_services(struct conf_server *server, WRBUF w);

diff --cc src/session.c
Simple merge

diff --cc win/makefile
Simple merge