Merge branch 'stable'

Conflicts:
	debian/changelog
	debian/control

debian/control

@@ -17,6 +17,8 @@ VCS-Git: git://github.com/tarantool/tarantool.git
 Package: tarantool-common
 Architecture: all
 Priority: optional
+Conflicts: tarantool-common (<< 1.5.3)
+Replaces: tarantool-common (<< 1.5.3)
 Depends: ${misc:Depends}, adduser
 Description: Tarantool in-memory database - common files
  Tarantool is an in-memory database and Lua application server.

debian/copyright

@@ -298,6 +298,8 @@ License:
  THE SOFTWARE.
 
 Files: third_party/qsort_arg.c
+    third_party/qsort_arg_mt.c
+    third_party/compat/sys/bsd_time.h
     third_party/queue.h
     connector/c/tntsql/include/tnt_queue.h
 Copyright: 1992, 1993 The Regents of the University of California.
@@ -329,6 +331,50 @@ License:
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
+Files: third_party/compat/unwind.h
+Copyright: 2001, 2003, 2004, 2006 Free Software Foundation, Inc.
+License:
+ This file is part of GCC.
+ .
+ GCC is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+ .
+ GCC is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+ License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING.  If not, write to the Free
+ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+ .
+ As a special exception, if you include this header file into source
+ files compiled by GCC, this header file does not by itself cause
+ the resulting executable to be covered by the GNU General Public
+ License.  This exception does not however invalidate any other
+ reasons why the executable file might be covered by the GNU General
+ Public License.
+
+Files: third_party/gopt/gopt.*
+Copyright: 2003-2008, Tom Vajzovic <tom.viza@gmail.com>
+License:
+ I, Tom Vajzovic, am the author of this software and its documentation
+ and permanently abandon all copyright and other intellectual property
+ rights in them, including the right to be identified as the author.
+ .
+ I am fairly certain that this software does what its documentation says
+ that it does, but I do not guarantee that it does, or that it does what
+ you think it should.  I do not guarantee that it will not have undesirable
+ side effects.
+ .
+ You are free to use, modify and distribute this software as you please,
+ but you do so at your own risk.  If you remove or hide this warning then
+ you may be responsible for any problems that are encountered by those who
+ obtain the software through you.
+
 Files: third_party/valgrind/*
 Copyright: 2000-2010 Julian Seward.
 License: