Conflicts:
	CMakeLists.txt

Conflicts:
	src/box/recovery.cc
	test/box/xlog.test

Merge gh-180 - ip address in log/title.

Null-merge since we use URI in 1.6

Conflicts:
	src/evio.cc
	src/tarantool.cc

No test case since we don't test contents of the log in 1.5.

Conflicts:
	src/lua/bsdsocket.cc
	test/box/bsdsocket.result

Add a testcancel() call to iowait().
A test case will be added to 1.6, where it's easier to do.

This patch fixes tcp_connect() for case when server sends
some data immediately after connect.

Conflicts:
	src/lua/bsdsocket.lua
	test/box/bsdsocket.result
	test/box/bsdsocket.test

This patch fixes logic of non-blocking tcp connect as it
described in man pages and Unix Network Programming vol.1.

Conflicts:
	src/lua/bsdsocket.cc
	test/lib/tarantool_preprocessor.py

Conflicts:
	doc/user/stored-procedures.xml
	src/lua/init.cc
	test/box/fiber.result
	test/box/fiber.test
	test/unit/fiob.c

The bug was in the test itself - lack of trailing 0
at the end..

Fix a build warning on FreeBSD i386

Update the user guide.