Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	mu4e/mu4e-view.el
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Lightly copyedit the documentation and docstrings
Merge remote-tracking branch 'origin/master'
Revert "* bump version to 0.9.9.6"

This reverts commit ab58307feaa80392db667671136815bc0885e154.
Merge pull request #459 from anadrome/master

* mu4e: lightly copyedit the documentation and docstrings
* mu4e: minor doc fixes
* mu4e: minor documentation update

Updating documentation to mention the second default keybinding for
'mu4e-headers-mark-for-something, '*', which was introduced in commit
c581468ac33fc753f06ce10a66a1ffaacc078df1.
* small doc fix
mu4e.texi: fix typo
Merge branch 'master' of github.com:djcb/mu
mu4e.texi: add hint about getting fields from raw messages

from a mailing-list reply, a quick & dirty way to get arbitrary headers
from a message.
Merge pull request #464 from anadrome/master

mu4e.texi: minor documentation update
Merge branch 'master' of github.com:djcb/mu