Merge branch 'master' into session_lock
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 8 Jul 2013 12:25:14 +0000 (14:25 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 8 Jul 2013 12:25:14 +0000 (14:25 +0200)
commit769ef22a7701232144c0e5b4e7bd6c2462200ecd
tree9c80bff22bc7d86328a17679e39dd670ea8c3c76
parente4b6e9af17b8108183b3cc92a1d8eba1f5c73d77
parent7501c48cb7c65ae26bfc4e47bf3b9fb46578070a
Merge branch 'master' into session_lock

Conflicts:
src/session.c
src/session.h
src/client.c
src/connection.c
src/http_command.c
src/session.c
src/session.h
test/test_http.urls