Merge branch 'master' into bug_4688
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 10 Nov 2011 10:05:14 +0000 (11:05 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 10 Nov 2011 10:05:14 +0000 (11:05 +0100)
commit5957bba20fb93c8c6829296d6ccf32e52b2114e2
tree325948004e310daaf5832dc1b3fa6238ecea2c8d
parented38d3e98fd668c293fd971d9e53bfbcaca1a485
parentfb486d4fa4ebc56c76bbc8f25c819b1bb4a144f7
Merge branch 'master' into bug_4688
src/client.c
src/client.h
src/session.c
src/session.h