summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-05-18 17:21:55 -0400
committerKali Kaneko <kali@futeisha.org>2016-05-18 17:23:03 -0400
commit4c2028f992060ee2b1c347f779d6103a08f805dd (patch)
tree377208e4ce83dedd890feb38580656901b8e7104
parent09eb021b3b8434ffafb6c958be3a95b38bfa6ba6 (diff)
parent476d88be6ecc464e111a66bc9466315d592cb76e (diff)
Merge branch 'master' into debian/experimentaldebian/experimental
-rw-r--r--CHANGELOG3
-rw-r--r--debian/changelog4
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 1cc4e04..140486d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+0.0.5 Apr 27, 2015:
+ o Read SMTP and IMAP passwords from the bitmask tokens file (#6041).
+
0.0.4 Jan 07, 2015:
o Do not disable caching checkbox for manual accounts when caching is turned
on (#4811).
diff --git a/debian/changelog b/debian/changelog
index 60d8a08..784de30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-xul-ext-bitmask (0.0.4.1) UNRELEASED; urgency=medium
+xul-ext-bitmask (0.0.5) unstable; urgency=medium
- * Merge tokens branch for testing.
+ * Update to 0.0.5 release.
-- Ben Carrillo <ben@futeisha.org> Thu, 07 Apr 2016 12:59:54 -0400