Merge branch 'master' into session_lock
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 17 Apr 2013 11:36:42 +0000 (13:36 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 17 Apr 2013 11:36:42 +0000 (13:36 +0200)
commit1722daadbb0dc8296c284c77abc3e773af6213d7
treeab8d355356650c4bc2be28c8475e8cef3644a388
parente92f216f5ff4f3384950852b3c54113e6e1e038c
parent538abdde82f2a1c8f5ce6f27c8ee0e0f71e989a7
Merge branch 'master' into session_lock

Conflicts:
src/session.c
src/session.c