summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-07-13 19:16:21 +0000
committerintrigeri <intrigeri@boum.org>2016-07-13 19:16:21 +0000
commit87bacb0aa9b33c2c65be63381edfe9fec8430261 (patch)
treefac50bd1d837758a421a07c97a1db98112aebfd7 /debian
parent6784378ad9311ba6769344f8a02700080893c932 (diff)
parentffaf7d1f3f9195404acf97c6b5855406ad861abd (diff)
Merge remote-tracking branch 'origin/devel' into test/10774-fragile-MAC_address_spoofing_fails_and_macchanger_returns_falsewip/test/10774-fragile-MAC_address_spoofing_fails_and_macchanger_returns_false
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog18
1 files changed, 12 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 11e0c73..19b3b36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+tails (2.6) UNRELEASED; urgency=medium
+
+ * Dummy entry.
+
+ -- anonym <anonym@riseup.net> Tue, 07 Jun 2016 09:07:40 +0200
+
+tails (2.5) UNRELEASED; urgency=medium
+
+ * Dummy entry.
+
+ -- anonym <anonym@riseup.net> Tue, 07 Jun 2016 09:07:40 +0200
+
tails (2.4.1) UNRELEASED; urgency=medium
* Dummy entry.
@@ -195,12 +207,6 @@ tails (2.4) unstable; urgency=medium
-- Tails developers <tails@boum.org> Mon, 06 Jun 2016 20:10:56 +0200
-tails (2.3.1) UNRELEASED; urgency=medium
-
- * Dummy entry.
-
- -- anonym <anonym@riseup.net> Tue, 26 Apr 2016 18:41:16 +0200
-
tails (2.3) unstable; urgency=medium
* Security fixes