Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 11 Sep 2014 12:12:58 +0000 (14:12 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 11 Sep 2014 12:12:58 +0000 (14:12 +0200)
Conflicts:
src/connection.c

1  2 
win/makefile

diff --cc win/makefile
Simple merge