Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 6 Mar 2015 10:17:31 +0000 (11:17 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 6 Mar 2015 10:17:31 +0000 (11:17 +0100)
commit294559ec552ed9b086d52984cdee74384ee6c34b
tree690a62da31f650565f81caa363da125a82f51af9
parentb414c6fc223434772ef8260a6f5d252e09feeaaa
parent13549028c3d11fc864e71fdc9339dbb0d6abaad8
Merge branch 'master' into paz-927
src/session.c
win/makefile