[Pkg-privacy-commits] [tails-installer] 03/03: Merge branch 'debian/sid' of ssh://git.debian.org/git/pkg-privacy/packages/tails-installer into debian/sid

[Ulrike Uhlig]

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

ulrike pushed a commit to branch debian/sid
in repository tails-installer.

commit 434faf03cccc5c321e68da0d9906dca81b5aa317
Merge: c165fac df7585b
Author: Ulrike Uhlig <u at 451f.org>
Date:   Thu May 25 20:46:16 2017 +0200

    Merge branch 'debian/sid' of ssh://git.debian.org/git/pkg-privacy/packages/tails-installer into debian/sid
    
    Conflicts:
    	debian/changelog

 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc debian/changelog
index da4fe06,3994c42..c48e905
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,8 @@@
  tails-installer (4.4.14+dfsg-1) unstable; urgency=medium
  
-   * New upstream version.
+   * New upstream release.
  
 - -- Ulrike Uhlig <u at 451f.org>  Thu, 25 May 2017 12:15:26 +0200
 + -- Ulrike Uhlig <u at 451f.org>  Thu, 25 May 2017 20:41:50 +0200
  
  tails-installer (4.4.14+dfsg-0tails2) bugfix-10731-lists-non-removable-devices; urgency=medium
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git