Lightly copyedit the documentation and docstrings
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
mu: Test splicing child containers when there is only one thread

This test reproduces a regression introduced by commit 97101f1f82ba
("mu: Prune empty container when an only child gets promoted to the
root set").

When the results of a mu-find query contain only a one thread:

$ mu find --threads --fields 'd s' ''
Sat 09 Aug 2014 07:00:00 PM CEST [mu4e] Test Message
  `-> Sat 09 Aug 2014 08:30:00 PM CEST Re: [mu4e] Test Message

... and we narrow down the query in such a way that the root message
gets excluded, then a crash occurs:

$ mu find --threads --fields 'd s' '' date:2014-08-09/20:00..2014-08-09/21:00
**
ERROR:mu-container.c:117:mu_container_append_siblings: assertion failed: (c)
Aborted (core dumped)

Reported-by: Josiah Schwab <jschwab@gmail.com>
mu: Prune empty containers from the root set after splicing their children

When the root set contains only one empty container with one child
first promote the child container to the root set and only then
remove the empty parent container so that the root set never goes
empty.

Also make mu_container_splice_children() do only one thing, that is
promote one container's children to be another container's siblings.
The resultant childless container is no longer removed by this
function.

Fixes #460.
mu: Make mu_container_splice_grandchildren() do only one thing

Don't kill the resultant childless container when promoting its
children. This unifies the behavior of mu_container_splice_*()
functions.
* 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.
Merge remote-tracking branch 'jsitnicki/thread-sort-fixes' into monolith-stable