Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 5 Sep 2014 11:52:51 +0000 (13:52 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 5 Sep 2014 11:52:51 +0000 (13:52 +0200)
commite9e5603afa14e52f004d64211345f1c3ab17a6a3
tree2212959c4afddd05f85184e42c0efdca98100654
parent7094858f3a32639b3262854815ce7a6efda9901e
parente6b0cc182fd882518a33f10bf46519b94e632267
Merge branch 'master' into paz-927
src/client.c
src/client.h
src/connection.c
src/pazpar2_config.c
src/pazpar2_config.h
src/session.c
win/makefile