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)
commita8767b7f9a59905fbb94ddbdf1848d629db3bb62
treec7fea1bd2e55be6483f4e692689d53f88251d19e
parent46dcd19fea52e19dcb5b1d2341241e9a8819c73e
parent62747ed9d1e5d4e2fb63f9072c54d30200a99e21
Merge branch 'master' into paz-927
src/client.c