* mu4e: fix some minor things in the main page
* mu4e: don't list footers as attachments
* cosmetics
guile: minor updates
* minor
* mu4e: fix typo
* mu4e/mu4e-headers.el (mu4e-headers-mode): Fix typo.
Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	mu4e/mu4e-headers.el
* mu4e/mu4e-utils.el (mu4e-update-mail-and-index): Don't run a new process if one is already running.
* mu4e/mu4e-compose.el (mu4e~compose-handler): Wait buffer setup before calling mu4e-compose-mode.
* mu4e: allow mu4e-html2text-command to be a function (thanks to tmalsburg)
* mu4e: make the faces a bit more generic
* mu4e: small improvement in mu4e-headers-found-hook defcustom
* mu4e-draft: small faces update
Merge pull request #300 from thierryvolpiatto/master

* fix empty buffer when replying and prevent user calling a new update when one is already running.