Merge branch 'maint'

A trivial conflict in configure.ac and remove/modify conflicts in
web/index.in.html and NEWS. The last file has been renamed to NEWS.md
in master. The conflict was resolved by copying the new text of the
NEWS file from maint (the release notes for v0.4.14) to NEWS.md and
to adjust the formatting to markdown syntax.

diff --git a/NEWS.md b/NEWS.md
index 449a3a1fc38e72ab137b25dfb7e6ceaa0d50ef68..b92015680986fc5d1702d2f9480410a21e4017bc 100644 (file)
--- a/NEWS.md
+++ b/NEWS.md
@@ -21,6 +21,39 @@ NEWS
 
 Download: [tarball](./releases/paraslash-git.tar.bz2)
 
+-------------------------------------------
+0.4.14 (2016-12-31) "branching oscillation"
+-------------------------------------------
+
+Many fixes for nasty bugs have accumulated over the years since 0.4.13
+was released in 2013. This release contains all of them. It is the
+last v0.4.x release, so v0.4.x is now end of life. The maint branch
+of the git repository has been forwarded to v0.5.7 and will start to
+receive important fixes for 0.5.x, which is now in maintenance mode.
+
+- Fix for the "double encryption bug" with gcrypt, which caused
+  garbage to be sent to stat clients.
+- The "prev" command of para_play now works as expected.
+- Invalid parameters for the begin and end chunk no longer cause
+  the afh receiver of para_recv to segfault.
+- A fix for an assertion that triggered in the FEC slice setup code.
+- Closing the terminal with a running para_gui causes the process to
+  die, rather than using 100% of CPU time.
+- para_gui no longer shows stale information about the previous
+  audio file.
+- A fix for a bug in the fec decoder which caused aborts if the buffer
+  pool filled up.
+- The assertion in the buffer tree code no longer triggers.
+- The "afs_event: table moods, event 0: key already exists in rbtree"
+  error no longer occurs on attribute changes.
+- A NULL pointer dereference in com_sender() has been fixed.
+- The -i option of lsatt works as advertised.
+- Various fixes for the build system.
+
+Downloads:
+[tarball](./releases/paraslash-0.4.14.tar.bz2),
+[signature](./releases/paraslash-0.4.14.tar.bz2.asc)
+
 ---------------------------------------
 0.5.6 (2016-07-10) "cascading gradient"
 ---------------------------------------