Merge branch 'master' into bug_4688
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 4 Nov 2011 13:34:58 +0000 (14:34 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 4 Nov 2011 13:34:58 +0000 (14:34 +0100)
commitf0c036628de8084804056af14c6f89990227bdaf
treee30d025121a8cc2c657f0f518e4a05c568a6fff0
parent3ec023c2084e86ab88e6d119dcfe889b41fcc87b
parent29d7b058269704d060ab5a39c9cec515cd8d7d87
Merge branch 'master' into bug_4688
src/session.c
src/session.h