Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 9 Sep 2014 10:41:15 +0000 (12:41 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 9 Sep 2014 10:41:15 +0000 (12:41 +0200)
commit09cd372980c24452ffd9d7a7660d9580f91884e8
treee16506ec9adcff9f84fde57864ef5fb8c757f57a
parent46b0ea81d4f9b9732dfc139a86342ce36c6038c8
parent22ac82b6522cc7ed34f93fa8dbdcbff383d23dab
Merge branch 'master' into paz-927
src/session.c