Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 2 Jul 2014 07:35:40 +0000 (09:35 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 2 Jul 2014 07:35:40 +0000 (09:35 +0200)
commit5f9bcb0650ab5b1661bf75f320dfbb204c6b6d6b
treeeab321b2d9178b4d739b2ec7023d872a8b236261
parented8400c109b2a440ed32e78368a554a35411e5b3
parent42dacbb729502f008f91000e27415c79c3b61e53
Merge branch 'master' into paz-927
src/client.c
src/connection.c
src/database.c
src/pazpar2_config.c
win/makefile