Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 30 Oct 2014 11:57:38 +0000 (12:57 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 30 Oct 2014 11:57:38 +0000 (12:57 +0100)
commit1c46d5e50ea73b0c0dc00bf745921ab2236b3a80
tree70353fb98670b6aec080b85b863c1d2702770000
parent2c9d7370a80943384fa385a8e78ccfad274ba1c7
parent376322f0e5d56c9dcc23d0f7d15c90eb58342326
Merge branch 'master' into paz-927

Conflicts:
src/client.c
src/connection.c
src/connection.h
src/client.c
src/client.h
src/connection.c
src/connection.h
src/session.c
win/makefile