Merge branch 'master' into session_lock
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 10 Apr 2013 15:02:01 +0000 (17:02 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 10 Apr 2013 15:02:01 +0000 (17:02 +0200)
commit07026e511036ed93f2a8deefe47c6f3a93029c25
treee0ab37ddb1c191dd4ddb9db6f9fbea694d8ee587
parent73d58258dfa2bdfa8f5f46f92f8452132bde272f
parentfd77a514963bee0496a969b627cb0737e0d88b47
Merge branch 'master' into session_lock
src/client.c