Alexey Sokolov 6ec64ebfba Merge branch '1.6.x' ...

Conflicts:
	ChangeLog.md
	configure.ac
	third_party/Csocket

2015-11-15 18:21:11 +00:00

..

Csocket @ 8d720c9497

Merge branch '1.6.x'

2015-11-15 18:21:11 +00:00

googletest @ f570b27e15

Import latest gtest to third_party to be able to use gmock

2015-09-06 21:42:37 +01:00