Snapsot_daemon doesn't start its fiber if snapshot_period=0. closes #546
Fix crash socket.getaddrinfo with wrong options. #364
Merge branch 'stable'

Conflicts:
	src/lua/bsdsocket.lua
	test/box/bsdsocket.test
Fix test system on Python 2.6.6
Fix ER_CREATE_FUNCTION format arguments
Fix OPENTAR-84: crash in on_replace_dd_func during recovery

`_func' space recovered before `_user' and auth_token can't
be retrived during creating struct func_def.
Merge remote-tracking branch 'github/master'
If filesystem doesn't support UNIX-sockets, skip bsdsocket test. closes #559
fix gh-571: sophia: memory leak issue
lbox_trigger_destroy doesn't crash in atexit. closes #583
Merge branch 'master' of github.com:tarantool/tarantool
Remove global struct recovery_state * pointer from recovery subsystem

Box still have a global pointer to its recovery state.
This pointer must only be used from TX thread from main process.

This patch is pre-requisite for thread-based JOIN/SUBSCRIBE handlers.

Other changes:

 * Add box_atfork() and recovery_atfork() callbacks
 * Change signature of recovery_state->row_handler
 * Execute JOIN request via box
 * Remove r->join_handler callback from recovery subsystem
Merge remote-tracking branch 'origin/master' into gh-578-join-thread-3
sophia: errors handling; submodule update
Merge branch 'master' of github.com:tarantool/tarantool into 194-shortcuts-for-console
Add help.register_extention method, #194