* mu4e/mu4e-main.el (mu4e-main-mode): `revert-buffer-function' should be local.
* mu4e/mu4e-compose.el (mu4e~compose-handler): Kill buffer on quit, transformed in defun*.
Merge remote-tracking branch 'refs/remotes/upstream/master'
* mu4e/mu4e-view.el (mu4e-view-fill-long-lines): New, bind it to M-q.
* mu4e/mu4e-view.el: Fix whitespaces in newline in previous commit, no code--change.
Merge pull request #448 from thierryvolpiatto/wash_fns

* mu4e/mu4e-view.el (mu4e-view-fill-long-lines): New, bind it to M-q.
Merge remote-tracking branch 'refs/remotes/upstream/master'
Merge pull request #445 from thierryvolpiatto/master

* mu4e: kill composition buffer when quitting from reply prompt
* bump version to 0.9.9.6
* mu4e/org-mu4e.el (org-mu4e-store-link): Add capture template keywords

For other email links (e.g., wl, mh, gnus), a number of keywords are
defined in org capture templates.  This makes these keywords available
for use in captures from mu4e.

http://orgmode.org/manual/Template-expansion.html

Inspiration from Roelof Burger
https://groups.google.com/d/msg/mu-discuss/4sffZofVKAY/aVTdVYoVyiUJ
Revert "* mu4e: don't add rogue \n where re-editing"

This reverts commit 5ab30cbc0998f209f3037255c5a3182e5151b75c.