Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 10 Sep 2014 07:39:27 +0000 (09:39 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 10 Sep 2014 07:39:27 +0000 (09:39 +0200)
commit46dcd19fea52e19dcb5b1d2341241e9a8819c73e
treec0fc62d9e86894fcd0c7c5bb905690ba441d4b35
parent09cd372980c24452ffd9d7a7660d9580f91884e8
parentefe1343048be89213f3a9933e6b9fbbd481f3d61
Merge branch 'master' into paz-927
src/session.c