merge from trunk for 2.7 release

debian/changelog

@@ -1,3 +1,10 @@
+ngcp-sipsak (0.9.6+sipwise5) unstable; urgency=low
+
+  [ Michael Prokop ]
+  * Wrap and sort items in Debian packaging files.
+
+ -- Andrew Pogrebennyk <apogrebennyk@sipwise.com>  Tue, 11 Dec 2012 12:20:47 +0100
+
 ngcp-sipsak (0.9.6+sipwise4) unstable; urgency=low
 
   * Fixed bad tagging

debian/control

@@ -2,7 +2,7 @@ Source: ngcp-sipsak
 Section: net
 Priority: optional
 Maintainer: Sipwise Development Team <support@sipwise.com>
-Build-Depends: debhelper (>= 4.0.0), libruli4-dev, libgnutls-dev, pkg-config
+Build-Depends: debhelper (>= 4.0.0), libgnutls-dev, libruli4-dev, pkg-config
 Standards-Version: 3.9.3
 
 Package: ngcp-sipsak
@@ -11,7 +11,6 @@ Depends: ${shlibs:Depends}
 Replaces: sipsak
 Conflicts: sipsak
 Description: SIP Swiss army knife
- sipsak is a small command line tool for developers and administrators of 
- Session Initiation Protocol (SIP) applications. 
+ sipsak is a small command line tool for developers and administrators of
+ Session Initiation Protocol (SIP) applications.
  It can be used for some simple tests on SIP applications and devices.
-