Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 17 Dec 2014 13:03:32 +0000 (14:03 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 17 Dec 2014 13:03:32 +0000 (14:03 +0100)
commitcea5d06318c86c9652cad5c4fefa39fa2e9745ac
treef3b368b4d267e3ef2d7dc03c416837d86e587c3c
parent1c46d5e50ea73b0c0dc00bf745921ab2236b3a80
parented767b87a099ee8c6b6a8723900dc3bf475d2a8b
Merge branch 'master' into paz-927
src/client.c
win/makefile