Merge master.
authorCarl Hetherington <cth@carlh.net>
Wed, 8 Oct 2014 22:02:35 +0000 (23:02 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 8 Oct 2014 22:02:35 +0000 (23:02 +0100)
commit12efbd5938f08eb445b43f539fa4f27aa5caccfb
treeff931f920b30ad187942206268d9f18b3f06448d
parent630a56ad9e7ecfb42b1d761098820f9e492f9c4e
parent0ae086a90ef262fed4e265df197fd62fcdfbccf7
Merge master.
ChangeLog
cscript
debian/changelog
src/lib/server.cc
src/lib/server_finder.cc
src/lib/util.cc
wscript