Merge branch 'master' into session_lock
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 7 Feb 2013 12:43:35 +0000 (13:43 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 7 Feb 2013 12:43:35 +0000 (13:43 +0100)
commit367b23c03b52b5d00624f05fdeed1171e37257c8
tree689705d581e1c1c518666fb5ab1e44f976d19830
parent7d4ba557fe01543f0a3aac7a1a738a426d0a1eff
parent9a1674900947c5617edc49ee2cad8158c321cbaf
Merge branch 'master' into session_lock
src/client.c
src/connection.c