From 33c3fb85f14aecc59d82f9861b13ee05b1f68819 Mon Sep 17 00:00:00 2001
From: Jephte CLAIN <Jephte.Clain@univ-reunion.fr>
Date: Tue, 27 Oct 2015 12:05:36 +0400
Subject: [PATCH 1/2] Init changelog & version 2.18.0

---
 CHANGES.txt | 7 +++++++
 VERSION.txt | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b578179..88a05c0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,10 @@
+## Version 2.18.0 du 27/10/2015-12:05
+
+434403a Intégration de la branche uscrontab
+2118885 uscrontab: possibilité de mettre en pause sans modifier les planifications en cours
+0eeee20 awkrun: renommer les fonctions quote_*
+18691c8 upassword: maj doc et support des commentaires pour le mode batch
+
 ## Version 2.17.2 du 26/09/2015-12:25
 
 1837a0c pxs: corriger xget, xcopy, xmove pour utiliser directement git annex sync
diff --git a/VERSION.txt b/VERSION.txt
index 94dc0ec..cf86907 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-2.17.2
+2.18.0

From 753ddce2eaba46afcee263cc9a36cdbf656b4ea5 Mon Sep 17 00:00:00 2001
From: Jephte CLAIN <Jephte.Clain@univ-reunion.fr>
Date: Tue, 27 Oct 2015 12:05:57 +0400
Subject: [PATCH 2/2] maj ulib

---
 lib/ulib/.ulibver | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ulib/.ulibver b/lib/ulib/.ulibver
index bfd92c5..882d40e 100644
--- a/lib/ulib/.ulibver
+++ b/lib/ulib/.ulibver
@@ -1 +1 @@
-009004000
+009005000