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.

Conflicts:
	src/box/tuple.cc
	test/big/lua.result
	test/box/lua.result

Conflicts:
	debian/control

Conflicts:
	client/tarancheck/tc_config.c
	client/tarancheck/tc_generate.c
	debian/control

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

Fix potential bug multiple parallel transactions

Conflicts:
	extra/rpm/tarantool.rpm.spec.in

Conflicts:
	doc/user/configuration-reference.xml
	doc/user/connectors.xml
	doc/user/databases.xml
	doc/user/server-administration.xml