Merge branch 'master' into session_lock session_lock
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 16 Jul 2013 13:53:56 +0000 (15:53 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 16 Jul 2013 13:53:56 +0000 (15:53 +0200)
1  2 
src/connection.c

Simple merge