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

diff --combined meetings/hd2015.mdwn
index 6d9b98d2fa7b1fb64d722e445ac14668eab0e9f4,8f606585a8ddcdc1b77e23c10a3fe420251bbf97..e78361f9bbb0525e333a792418f5c3fe38ea7dd2
--- 1/meetings/hd2015.mdwn
--- 2/meetings/hd2015.mdwn
+++ b/meetings/hd2015.mdwn
@@@ -1,12 -1,6 +1,12 @@@
 -Bremner and dkg are co-hosting a BoF at debconf:
 +What, Where, When
 +=================
 +
 +*  Bremner and dkg are co-hosting a BoF at [debconf](https://summit.debconf.org/debconf15/meeting/217/improving-privacy-and-security-for-notmuch-mail/).
 +
 +* The meeting is Monday 2015-08-17, 1700-1800
 +
 +* Video streaming should be [available](https://wiki.debconf.org/wiki/DebConf15/Videostream/Amsterdam)
  
 -https://summit.debconf.org/debconf15/meeting/217/improving-privacy-and-security-for-notmuch-mail/
  
  Agenda
  ======
@@@ -18,7 -12,8 +18,8 @@@ Moving parts for secure e-mai
  * notmuch-emacs
  * libgmime
  * GnuPG
- * mml-mode
+ * xapian
+ * mml-mode (emacs)
  * webmail:
    * noservice
    * notmuch web