Merge branch 'master' into session_lock
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 12 Mar 2013 14:31:08 +0000 (15:31 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 12 Mar 2013 14:31:08 +0000 (15:31 +0100)
commit6f548b64d72d67b533d0c99e0c171815873ada40
treee5b851136e9c161bcc26d2daa61cd625e1847ca2
parentfcfaa677034a38dfa4d8933bef2bdcf6af329036
parent6e2b2cc9c5c0290bf2fc53ff3dab7bf15c97526b
Merge branch 'master' into session_lock
src/session.c