Initialize git-dpm
Use input method from python six

 Something our unittests didnt catch which is more functional
 than anything. Using raw_input fails on python3 because it was
 renamed to input. Six provides an alias that handles both
 cases.

Author: Adam Stokes <adam.stokes@ubuntu.com>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1302808
Origin: upstream, https://github.com/sosreport/sos/commit/65d8fb5d30682dffffab1daf06662dafb9e303f2.patch
do_not_collect_isos_in_cobbler_plugin

Do not collect isos in cobbler plugin
 In Ubuntu isos are being added to the tarball, do not do that.

Author: Adam Stokes <adam.stokes@ubuntu.com>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1302837
Origin: upstream, https://github.com/sosreport/sos/commit/3ff674035d8962bf3ca3320900fccc6619af7a3d.patch
collect-cloud-init-log

Add collection of /var/log/cloud-init.log
 and /var/log/cloud-init-output.log if they exist.
    
Author: Louis Bouchard <louis.bouchard@canonical.com>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1301819
Origin: upstream, https://github.com/sosreport/sos/commit/36efd32ab01df2c076c3271543d674a515094375
fix-command-not-found

Fix verbose file logging
     
    Prior versions of sos enable debug logging to the embedded log
    file (sos_logs/sos.log) when a single '-v' is given. Restore this
    behaviour and ensure that command-not-found messages are reported
    at 'info' rather than 'warning' level.

Author: Bryn M. Reeves <bmr@redhat.com>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1303745
Origin: upstream, https://github.com/sosreport/sos/commit/commit 0338a955a930286beaa7b66c5167be9b15d34d78
get-interfaces.d

Add collection of /etc/network/interfaces.d for Ubuntu
     
    Since 14.04 Trusty, ubuntu uses config scripts in 
    /etc/network/interfaces.d. Collect those.
    Closes: #264
    
Author: Louis Bouchard <louis.bouchard@canonical.com>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1303723
Origin: upstream, https://github.com/sosreport/sos/commit/f4dc6422e3008ae7ba060a0d469284dff5c5daad
Import sosreport_3.1-1ubuntu2.dsc
Import sosreport 3.1-1ubuntu2
update debian/patches directory