# HG changeset patch
# User Sebastien Decugis <sdecugis@freediameter.net>
# Date 1559486368 -28800
# Node ID 09f94b1bedc32b58f5762e48c197f9efa293e4b9
# Parent  cf411b1dcbbbf3908ab81e89560661aa474f2c4a# Parent  23db8abdccda6ab4eed6057333a5d398a6a8cc29
Merge new proposed changes

diff -r cf411b1dcbbb -r 09f94b1bedc3 .hgtags
--- a/.hgtags	Wed May 29 16:36:32 2019 +0200
+++ b/.hgtags	Sun Jun 02 22:39:28 2019 +0800
@@ -79,3 +79,4 @@
 0000000000000000000000000000000000000000 1.2.1
 2cb8d71a405df19cf385e49e237f649589513e8d 1.2.1
 73b9f2aefb75f066d891a03a9145cc7addb2f2d3 1.3.0
+08a82e81951356c913285e9d54989e52549e8d63 1.3.1
diff -r cf411b1dcbbb -r 09f94b1bedc3 CMakeLists.txt
--- a/CMakeLists.txt	Wed May 29 16:36:32 2019 +0200
+++ b/CMakeLists.txt	Sun Jun 02 22:39:28 2019 +0800
@@ -10,7 +10,7 @@
 
 # Version of the source code
 SET(FD_PROJECT_VERSION_MAJOR 1)
-SET(FD_PROJECT_VERSION_MINOR 2)
+SET(FD_PROJECT_VERSION_MINOR 3)
 SET(FD_PROJECT_VERSION_REV 1)
 
 # Version of the API with the library
diff -r cf411b1dcbbb -r 09f94b1bedc3 INSTALL.Ubuntu
--- a/INSTALL.Ubuntu	Wed May 29 16:36:32 2019 +0200
+++ b/INSTALL.Ubuntu	Sun Jun 02 22:39:28 2019 +0800
@@ -46,6 +46,8 @@
 # Install the dependencies for building the source:
 sudo apt-get -y install mercurial cmake make gcc g++ bison flex libsctp-dev libgnutls-dev libgcrypt-dev libidn11-dev ssl-cert debhelper fakeroot \
    libpq-dev libmysqlclient-dev libxml2-dev swig python-dev
+   
+# On latest Ubuntu you will need libgnutls28-dev instead of libgnutls-dev
 
 # Retrieve the latest version of the source package
 cd