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)
Conflicts:
src/session.c


No differences found