Conflicts:
	CMakeLists.txt

In order for the next master-stable tag
to stay on the master-stable branch and not confuse
git describe of 'master', increase the release
version of the 'master' (unstable).

Bug#748630, Make --help and --version follow GNU standard: 1.4
part.

Rename --daemonize to --background to follow the GNU
convention.

Merge the fix for Bug#748630
into 'master'.

Conflicts:
	test/box/args.result

A partial fix for Bug#748630
"Make --help and --version follow GNU standard".

Add product name to the --version output.
Leave --help intact, there is sufficient
information about how to report bug in it
already.

Update test results.

Remove an unused declaration from tarantool.h.

Add mod_name to each module and output
it in --version.

Manual merge of Bug#702399 from master-stable.

Conflicts:
	mod/box/box.m

Conflicts:
	include/iproto.h
	test/box/protocol.c
	test/box/protocol.result

Conflicts:
	CMakeLists.txt

Instead of trying to do a platform-safe but lower-speed
integer extraction from network, add a configuration check
for rare platforms and refuse to compile on them.
Keep the code simple for x86.

Conflicts:
	test/box/protocol.c

Implement review fixes along the way (coding style, structure
the error handling in the client library differently).
Add test/box/protocol to .gitignore.
Produce more informative error messages in protocol.c/protocol.test.

Manually merge a fix for Bug#748599

Conflicts:
	test/box/args.result

Cleanup test/box/protocol.test:
 * move each test to an own functions
 * line up with the coding style (tabs, braces position)

Move the cmake check for ObjectiveC compiler to an own
file. Tweak the output a bit.

tarantool_ev.m doesn't have to be an Objective C file,
since it's only a wrapper around C file ev.c.

Conflicts:
	mod/box/box.h
	mod/silverbox/memcached.c

Replace a few more macros with inline functions.

Move the definition of an auxiliary macro to errcode.c.
Remove a barely justified macro.

Manual merge.

Conflicts:
	core/CMakeLists.txt
	core/pickle.m
	mod/box/box.h
	mod/box/memcached.m

Move the definition of an auxiliary macro to errcode.c.
Remove a barely justified macro.

Add errcode_record structure that contains string represenataion of
an error, numerical value of an error to send to a client, and
textual description of an error.

Manually merge Bug#735140 from master-stable
to master.

Conflicts:
	mod/box/index.m

A fix for
http://bugs.launchpad.net/bugs/769040
"Incomplete error output in Memcached protocol"

Append an error description to a memcached error answer.

A fix and a test case for
http://bugs.launchpad.net/bugs/735140
"Partial REPLACE corrupts index"

Check in validate_indexes if a tuple is long enough to cover
all indexes supported in a namespace.

Update auto generated (by confetti) cfg/prscfg.c.

Test case to check stat_cleanup.

Replace fiber->reading_inbox with corresponding FIBER_READING_INBOX flag.
Replace coro_save_and_longjmp in fiber_raise with tnt_raise of tnt_FiberException.