[Pkg-mozext-commits] [automatic-save-folder] 01/03: Merge branch 'jessie'

[Sascha Girrulat]

This is an automated email from the git hooks/post-receive script.

sagiru-guest pushed a commit to branch master
in repository automatic-save-folder.

commit a16d1e705dd281dcd25418c23caeee01fc97d08d
Merge: 2a983c4 3f16f7b
Author: Sascha Girrulat <sascha at girrulat.de>
Date:   Thu Aug 20 16:14:11 2015 +0200

    Merge branch 'jessie'
    
    Conflicts:
    	debian/changelog

 debian/changelog                                   | 19 ++++-
 ...on-handling-during-the-start-of-iceweasel.patch | 74 ++++++++++++++++
 ...02-update-button-labels-to-manage-filters.patch | 98 ++++++++++++++++++++++
 debian/patches/series                              |  2 +
 4 files changed, 192 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 464b546,7b197f4..12e2b45
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,7 -1,14 +1,24 @@@
 +automatic-save-folder (1.0.5~20140831-1) unstable; urgency=medium
 +
++  [David Prévot]
++    * Pick the latest version from upstream VCS
++
++  [Sascha Girrulat]
++    * import patches from jessie
++    
++ -- Sascha Girrulat <sascha at girrulat.de>  Thu, 20 Aug 2015 16:11:20 +0200
++
+ automatic-save-folder (1.0.4-7) unstable; urgency=medium
+ 
+   * Fixup debian changelog
+   * Fix version handling during the start of iceweasel (Closes: #796225)
+   * Update button labels to manage filters (Closes: #796222)
+ 
+  -- Sascha Girrulat <sascha at girrulat.de>  Thu, 20 Aug 2015 15:50:40 +0200
+ 
+ automatic-save-folder (1.0.4-5) unstable; urgency=medium
+ 
    * Team upload
-   * Pick the latest version from upstream VCS
    * Adapt watch file for new amo scheme
    * Add back ${xpi:Breaks}
    * Shorten description

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/automatic-save-folder.git