Merge branch 'v1.2.stable' of ssh://git.freeswitch.org:222/freeswitch into v1.2.stable

debian/AUTHORS

@@ -23,4 +23,3 @@ Thanks-to: Steven Ayre <steveayre@gmail.com>
 
 Thanks-to: William King <william.king@quentustech.com>
 # for moral support and small tweaks
-

debian/bootstrap.sh

@@ -1018,7 +1018,7 @@ print_edit_warning () {
 }
 
 gencontrol_per_mod () {
-  print_mod_control "$module_name" "$description" "$long_description" >> control  
+  print_mod_control "$module_name" "$description" "$long_description" >> control
 }
 
 gencontrol_per_cat () {

debian/control-modules

@@ -696,4 +696,3 @@ Description: mod_xml_rpc
 Module: xml_int/mod_xml_scgi
 Description: mod_xml_scgi
  Adds mod_xml_scgi.
-

debian/copyright

@@ -1427,7 +1427,7 @@ Files: libs/js/nsprpub/pr/tests/tmocon.c
  libs/js/nsprpub/pr/src/md/unix/os_ReliantUNIX.s
  libs/js/nsprpub/pr/src/md/unix/os_Darwin_ppc.s
  libs/js/nsprpub/pr/src/md/unix/os_SunOS_ultrasparc.s
- libs/js/nsprpub/pr/src/md/unix/os_Linux_ia64.s 
+ libs/js/nsprpub/pr/src/md/unix/os_Linux_ia64.s
  libs/js/nsprpub/pr/tests/testfile.c
  libs/js/nsprpub/pr/src/md/unix/os_Darwin_x86.s
  libs/js/nsprpub/pr/src/md/unix/os_AIX.s
@@ -1958,7 +1958,7 @@ License: LGPL
 
 Files: libs/libwebsockets/win32port/zlib/*
 Copyright: 1995-2010 Jean-loup Gailly
- 1995-2010 Mark Adler 
+ 1995-2010 Mark Adler
  1995-2010 Jean-loup Gailly and Mark Adler
  1995-2010 Jean-loup Gailly and Mark Adler ";
 License: zlib/libpng

debian/freeswitch-systemd.freeswitch.service

@@ -32,4 +32,3 @@ UMask=0007
 
 [Install]
 WantedBy=multi-user.target
-

debian/rules

@@ -133,4 +133,3 @@ binary-quicktest:
 	echo "applications/mod_commands" > debian/modules.conf
 	(cd debian && ./bootstrap.sh)
 	dh binary
-

debian/util.sh

@@ -455,4 +455,3 @@ case "$cmd" in
   create-orig) create_orig "$@" ;;
   *) usage ;;
 esac
-