[Merge] lp:~noskcaj/ubuntu/vivid/urlgrabber/3.10.1 into lp:ubuntu/urlgrabber

[Daniel Holbach]

Review: Needs Fixing

daniel at daydream:~/urlgrabber$ bzr merge lp:~noskcaj/ubuntu/vivid/urlgrabber/3.10.1
Unapplying quilt patches to prevent spurious conflicts                                                                                                
+N  scripts/urlgrabber-ext-down                                                                                                                       
 M  ChangeLog
 M  MANIFEST
 M  PKG-INFO
 M  README
 M  debian/changelog
-D  debian/patches/grabber_fix.diff
-D  debian/patches/progress_fix.diff
-D  debian/patches/progress_object_callback_fix.diff
 M  debian/patches/series
 M  scripts/urlgrabber
 M  setup.py
 M  test/base_test_code.py
 M  test/munittest.py
 M  test/test_byterange.py
 M  test/test_grabber.py
 M  test/test_mirror.py
 M  urlgrabber/__init__.py
 M  urlgrabber/byterange.py
 M  urlgrabber/grabber.py
 M  urlgrabber/mirror.py
 M  urlgrabber/progress.py
Text conflict in urlgrabber/grabber.py
1 conflicts encountered.                                                                                                                              
daniel at daydream:~/urlgrabber$ 

-- 
https://code.launchpad.net/~noskcaj/ubuntu/vivid/urlgrabber/3.10.1/+merge/244676
Your team Ubuntu branches is subscribed to branch lp:ubuntu/urlgrabber.