Add sql.txt, describing the supported SQL grammar,
to which the user guide refers.

Add more content to the user guide (language reference, memcached support).

Learn how to use olinking correctly.
Add errcode.xml - the list of all error codes.
While at it, add markers to errcode.h signalling
that whenever it is changed, errcode.xml also needs a change.
Get rid of ERR_CODE_UNKNOWN_ERROR - it has no raison d'être.

Tweak the docbook to html XSL rules, in particular
table of contents generation.

Explain how to configure a namespace.
Tweak some error messages on the way.

Adjust signature of tbuf_ltrim, add comments,
replace a check with an assert.

tbuf: tbuf_ltrim function was added.
admin: admin_dispatch routine was fixed. fiber read buff managment was changed
       from peek to trim.

Update test results.

Review fixes: the original patch is fine,
but since we use strlen() for help, let's use strlen() for
unknown_command too.

Fix the test runner after rename of --daemonize to --background.
Add comments to README.

Update comments in the configuration templates
(spelling errors).

Conflicts:
	core/fiber.m
	include/fiber.h
	include/palloc.h

external (allocated outside a structure) to internal one (within a
structure).

Exclude 'doc' subdirectory from 'all'. Do not require
any special DocBook tools from those who do not write documentation.

  (Bug #716683).

Conflicts:
	README

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