commit 15480d7250bf39b019f6473b9338fcff3a5f129a
author Willy Tarreau <w@1wt.eu> Thu Jun 19 21:10:58 2014 +0200
committer Willy Tarreau <w@1wt.eu> Thu Jun 19 21:11:06 2014 +0200
tree 803363a175c19c88af93d9343452578e115b8c05
parent 9229f1248f2a2ec9ea6691caf60301a2dbad1a70

[DEV] open new 1.6 development branch

This new branch is based on 1.5.0, which 1.6-dev0 is 100% equivalent to.
The README has been updated to mention that it is a development branch.

Released version 1.6-dev0 with the following main changes :
    - exact copy of 1.5.0

doc/configuration.txt

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 5ee2ae8..5f80674 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -2,7 +2,7 @@
                                 HAProxy
                           Configuration Manual
                          ----------------------
-                              version 1.5
+                              version 1.6
                              willy tarreau
                               2014/06/19