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)
commit66c4fe75aca4e4f45ef4820c087f3509c5edacd2
tree11b7a589ee2b8008ca46031298bfb7c8964680c8
parent769ef22a7701232144c0e5b4e7bd6c2462200ecd
parent464f19c366e6016b3d18cf1cede3805f922417a8
Merge branch 'master' into session_lock
src/connection.c