Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 8 Sep 2014 12:33:05 +0000 (14:33 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 8 Sep 2014 12:33:05 +0000 (14:33 +0200)
commitdcb7c9bf6a3ac5da671fd889ebb989b610ba6bc5
tree5cdc7c2291830803842d8138f0a3ef5ff4ad7b8b
parente9e5603afa14e52f004d64211345f1c3ab17a6a3
parent9c7160ee28a1542ec39f024cc60e39e163a920d1
Merge branch 'master' into paz-927
src/session.c