Merge branch 'release'

[notmuch] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 0bc2d7bb4335227946a7b418e6fe7aa253cefa22..4e6cda69976eaaafe62450fcba1bdbfb7e9900c6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -535,7 +535,7 @@ notmuch (0.18-3) unstable; urgency=medium
 notmuch (0.18-2) unstable; urgency=medium
 
   * Disable atomicity tests on armhf. These should be re-enabled when
-    upstream relases a fix for this (in progress).
+    upstream releases a fix for this (in progress).
 
  -- David Bremner <bremner@debian.org>  Thu, 08 May 2014 08:28:33 +0900
 
@@ -956,7 +956,7 @@ notmuch (0.6.1-1) unstable; urgency=low
 notmuch (0.6) unstable; urgency=low
 
   * New upstream release; see /usr/share/doc/notmuch/NEWS for
-    details. Hilights include:
+    details. Highlights include:
     - Folder-based search (Closes: #597222)
     - PGP/MIME decryption and verification
   * Document strict dependency on emacs23 (Closes: #631994).