Merge branch 'master' into fetch_more
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 7 Feb 2013 12:30:20 +0000 (13:30 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 7 Feb 2013 12:30:20 +0000 (13:30 +0100)
1  2 
src/client.c
src/client.h

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