Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 23 Apr 2014 09:16:07 +0000 (11:16 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 23 Apr 2014 09:16:07 +0000 (11:16 +0200)
commite2e42808d8ea15688b8a6cc3bd1b0f77d915b995
treea934a2c2d7d43dd18acdb8f44690733a93e32b11
parent15e9827798d09d1afda3304d021bf464fb997624
parentff0f1523c1436f4b2f0b334a53e0fbaba1b9ae84
Merge branch 'master' into paz-927
src/client.c
win/makefile