Merge remote-tracking branch 'refs/remotes/origin/master'

diff --git a/meetings/hd2015.mdwn b/meetings/hd2015.mdwn
index 6d9b98d2fa7b1fb64d722e445ac14668eab0e9f4..e78361f9bbb0525e333a792418f5c3fe38ea7dd2 100644 (file)
--- a/meetings/hd2015.mdwn
+++ b/meetings/hd2015.mdwn
@@ -18,7 +18,8 @@ Moving parts for secure e-mail
 * notmuch-emacs
 * libgmime
 * GnuPG
-* mml-mode
+* xapian
+* mml-mode (emacs)
 * webmail:
   * noservice
   * notmuch web