* 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.
* mu4e: restore the old update-buffer behaviour
* mu4e: fix faces in the mu4e-main
* mu4e: some improvements in the update-mail window behaviour (wip)
* mu4e: some more work on the updating process
* mu4e: centralize some of the fontification code; cleanup signature support
* mu4e: run mu4e-view-mode only when the marked-as-read message is received
* mu: initialize randomness in mu-cmd-server
* mu4e: don't error out if no empty lines are found
* mu4e: make sure the sent-hook is only defined as *local* in mu4e-compose
* mu4e: don't error out on parts without mime-type