Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 11 Sep 2014 12:12:58 +0000 (14:12 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 11 Sep 2014 12:12:58 +0000 (14:12 +0200)
commit2c9d7370a80943384fa385a8e78ccfad274ba1c7
treed6f26bdf6f9542015a98d3c4bc81c47796930158
parent6bb268489f976ebf432cf6b907715911aa4366a3
parent1aa3d495d48e9f30c1be3dbca4c790d518438d77
Merge branch 'master' into paz-927

Conflicts:
src/connection.c
win/makefile