Merge branch '1.3.x'

doc/conf.py

@@ -52,7 +52,7 @@ copyright = u'2015, Antoine Nguyen'
 # The short X.Y version.
 version = '1.3'
 # The full version, including alpha/beta/rc tags.
-release = '1.3.0'
+release = '1.3.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/getting_started/install.rst

@@ -110,7 +110,8 @@ Deployment
    prefix. The primary connection must use the ``default:`` prefix (as
    shown in the example above). For the `amavis extension
    <http://modoboa-amavis.readthedocs.org>`_ extension, use the
-   ``amavis:`` prefix like this ``amavis:<database url>``.
+   ``amavis:`` prefix. An example two connections: ``--dburl
+   default:<database url> amavis:<database url>``.
 
    Your database url should meet the following syntax
    ``scheme://[user:pass@][host:port]/dbname`` **OR**

setup.py

@@ -54,7 +54,7 @@ def read(fname):
 
 setup(
     name="modoboa",
-    version='1.3.0',
+    version='1.3.1',
     url='http://modoboa.org/',
     license='MIT',
     description="Mail hosting made simple",