Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 10 Sep 2014 18:48:03 +0000 (20:48 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 10 Sep 2014 18:48:03 +0000 (20:48 +0200)
1  2 
src/client.c

diff --cc src/client.c
Simple merge