[Pkg-privacy-commits] [tails-installer] 03/03: Merge branch 'debian/experimental' into ubuntu/xenial

[anonym]

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

anonym-tails-guest pushed a commit to annotated tag ubuntu/4.4.5+dfsg-1ubuntu1
in repository tails-installer.

commit cd934ec69a0dd77fc56f526821d37b027a7e84de
Merge: c5362e1 401c719
Author: Ulrike Uhlig <u at 451f.org>
Date:   Tue Dec 1 00:34:11 2015 +0100

    Merge branch 'debian/experimental' into ubuntu/xenial
    
    # Conflicts:
    #	debian/changelog
    #	debian/gbp.conf

 debian/changelog | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 53363cc,44c8cfb..f0aa716
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
- tails-installer (4.4.5+dfsg-0ubuntu1) xenial; urgency=medium
++tails-installer (4.4.5+dfsg-1ubuntu1) xenial; urgency=medium
 +
 +  * Team upload.
 +
 + -- Ulrike Uhlig <u at 451f.org>  Mon, 30 Nov 2015 20:34:49 +0100
 +
+ tails-installer (4.4.5+dfsg-1) experimental; urgency=medium
+ 
+   * Team upload.
+ 
+  -- intrigeri <intrigeri at debian.org>  Sun, 29 Nov 2015 18:32:51 +0000
+ 
  tails-installer (4.4.5+dfsg-0tails1) feature-jessie; urgency=medium
  
    * New upstream release:

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