Merge branch 'refs/heads/t/taggers'

Cooking in next since 2015-04-26.

* refs/heads/t/taggers:
  aac: Fix compilation without libmp4v2.
  The mp4 tagger.
  The mp3 tagger.
  The flac tagger.
  The ogg/speex tagger.
  The ogg/vorbis tagger.
  The ogg/opus tagger.
  The wma tagger.

diff --cc Makefile.in
Simple merge

diff --cc Makefile.real
Simple merge

diff --cc NEWS
index d98930c79e1de7660a848f73529200399f70c991,22e16ebe869dfc976f0cc0e6117036153c77e46d..f1940d3d0780e428816f7c3f241273a795cce04e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,12 -1,9 +1,19 @@@
  NEWS
  ====
  
 ------------------------------------------
 -current master branch "magnetic momentum"
 ------------------------------------------
++------------------------------------------
++current master branch "cascading gradient"
++------------------------------------------
++
++      - para_afh learned to modify meta tags of mp3 wma ogg spx
++        opus flac aac files.
++
 +--------------------------------------
 +0.5.5 (2015-09-20) "magnetic momentum"
 +--------------------------------------
 +
 +Many new features and a lot of other improvements.
 +
        - On Linux systems, local sockets are now created in the
          abstract name space by default. This allows to get rid of
          the socket specials in /var/paraslash.

diff --cc afh_common.c
Simple merge

diff --cc configure.ac
Simple merge

diff --cc error.h
Simple merge

diff --cc web/about.in.html
index 5936f932035d874376eb4dbf72963698cd943f63,0000000000000000000000000000000000000000..2c72f28126d2ba083ac0de69f643c6b501820987
mode 100644,000000..100644
--- 1/web/about.in.html
--- /dev/null
+++ b/web/about.in.html
@@@ -1,23 -1,0 +1,23 @@@
-       <li> Stand-alone decoder/player </li>
 +<h1>About</h1>
 +<hr>
 +
 +Paraslash is a collection of network audio streaming tools for Unix
 +systems. It is written in C and released under the GPLv2.
 +
 +<ul>
 +      <li> Runs on Linux, Mac OS, FreeBSD, NetBSD </li>
 +      <li> Mp3, ogg/vorbis, ogg/speex, aac (m4a), wma, flac and ogg/opus support </li>
 +      <li> http, dccp and udp network streaming </li>
++      <li> Stand-alone decoder, player, tagger </li>
 +      <li> Curses-based gui (<a href="gui.png">screenshot</a>) </li>
 +      <li> Integrated volume normalizer, fader, alarm clock </li>
 +      <li> Sophisticated audio file selector </li>
 +      <li> Command line interface with tab-completion </li>
 +      <li> Open source and well documented </li>
 +</ul>
 +
 +<b> Author: </b> Andr&eacute; Noll,
 +<a href="mailto:maan@tuebingen.mpg.de">maan@tuebingen.mpg.de</a>
 +<br>
 +Comments and bug reports are welcome. Please provide the version of
 +paraslash you are using and relevant parts of the logs.

diff --cc web/manual.m4
Simple merge