tutorial.xml first example
Move postgresql, mysql into Recommends section, closes #260
Merge branch 'master' of github.com:tarantool/tarantool
Fix depends on *sql-module's
Fix compilation on clang 3.5 at least for Linux
Merge branch 'stable'

Conflicts:
	connector/c/tntsql/tnt_sql.c
	src/palloc.cc
Merge branch 'ocelot-master'
Merge branch 'master' of github.com:tarantool/tarantool
Implement asynchronous multi-master replication #270
debian: rename libtarantool-dev to tarantool-dev
Remove version suffix from modules path
Merge branch 'stable'

Conflicts:
	CMakeLists.txt
	debian/libtarantool-dev.install
	debian/rules
	debian/tarantool-dev.install
	debian/tarantool-mysql-module.install
	debian/tarantool-postgresql-module.install
	debian/tarantool-sophia-module.install
	debian/tarantool-sql-module.install
	extra/rpm.spec.in
Fix a merge problem of 83882947a81b51234114031dc0acf310c606672d
Fix clang warnings(funopen)
Merge branch 'stable'
Add libgen for Apple
Remove python dependencies
Merge branch 'stable'

Conflicts:
	debian/control
Add a hack to keep FFI symbols in optimized binary
Merge branch 'stable'

Conflicts:
	src/ffisyms.cc
	src/tarantool.cc