Merge branch 'master' into session_lock
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 22 Mar 2013 11:52:08 +0000 (12:52 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 22 Mar 2013 11:52:08 +0000 (12:52 +0100)
commite301ab5c0952d2167cbdfc97c63eba752949e692
treee8fe98934ea22be6956ca0d6f20e92bd06b7483e
parent1e50eff11ddc6980b7d1da07b9ad5f19c39d4b54
parentfc88d4ecfe71c017419d93a8cf33cecb62cdc8b3
Merge branch 'master' into session_lock
src/client.c
src/session.c