summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2013-04-08 10:54:41 +0200
committerTails developers <amnesia@boum.org>2013-04-08 10:54:41 +0200
commit75b4d7397fdd4f9dd78f769b6e26719c10fb59a8 (patch)
tree1d9cf7ea0a083f8952283a14a98f6e2565a90d21 /debian
parent58972c3c19c99de00bec74ff043f0136ceec6abd (diff)
parentb60d5b793a09ed71a9b248e2fd9f0a51a0023cb8 (diff)
Merge branch 'stable' into devel
Conflicts: debian/changelog
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index b9de6a9..1757259 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ tails (0.18) UNRELEASED; urgency=low
-- Tails developers <tails@boum.org> Mon, 25 Feb 2013 00:37:39 +0100
-tails (0.17.2~rc1) unstable; urgency=low
+tails (0.17.2) unstable; urgency=low
* Iceweasel
- Upgrade to Iceweasel 17.0.5esr-0+tails2~bpo60+1.
@@ -43,7 +43,7 @@ tails (0.17.2~rc1) unstable; urgency=low
- Add automated testing framework (Sikuli, Cucumber, libvirt -based)
with a bunch of tests.
- -- Tails developers <amnesia@boum.org> Wed, 03 Apr 2013 13:07:49 +0200
+ -- Tails developers <amnesia@boum.org> Sun, 07 Apr 2013 12:17:26 +0200
tails (0.17.1) unstable; urgency=low