From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 2 Feb 2015 13:07:31 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0bd6e22c63d57c6396ef4654f63003b6a0ebed6b;p=deefuzzer.git

Merge branch 'master' into dev
---

0bd6e22c63d57c6396ef4654f63003b6a0ebed6b
diff --cc README.rst
index ac8abc9,b260cbc..40b3b5a
--- a/README.rst
+++ b/README.rst
@@@ -131,12 -131,11 +131,11 @@@ Documentatio
  =============
  
   * `FAQ and Wiki <https://github.com/yomguy/DeeFuzzer/wiki>`_
 - * `API <http://files.parisson.com/doc/deefuzzer/>`_ 
 + * `API <http://files.parisson.com/doc/deefuzzer/>`_
   * `Documented XML configuration <https://github.com/yomguy/DeeFuzzer/blob/master/example/deefuzzer_doc.xml>`_
   * Configuration examples:
 -     
 +
       * `Dummy XML for testing <https://github.com/yomguy/DeeFuzzer/blob/master/example/deefuzzer.xml>`_
-      * `OGG Vorbis and MP3 together <https://github.com/yomguy/DeeFuzzer/blob/master/example/deefuzzer_mp3_ogg.xml>`_
       * `Generic YAML <https://github.com/yomguy/DeeFuzzer/blob/master/example/deefuzzer.yaml>`_