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)
commit7f0b4d88eca113e5eb0beac2046180e9ff9d08ea
tree6d05895fa5e2845fe2ff2e6d2b5cb56f7e48b345
parenta5c3dee6eb34da90683db5ac0b0e4e876627496b
parent77ba2b539f5e7e74af67194b7f78a55cf7310edc
Merge branch 'master' into paz-927
src/client.c
src/client.h
src/connection.c