Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 6 Mar 2015 13:13:21 +0000 (14:13 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 6 Mar 2015 13:13:21 +0000 (14:13 +0100)
1  2 
src/client.c
src/client.h
src/connection.c

diff --cc src/client.c
Simple merge
diff --cc src/client.h
Simple merge
Simple merge