From adef7bacc4cc48bcc85f3b82b08fe9df8df8616c Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Wed, 1 Jul 2015 03:09:04 +0400
Subject: [PATCH] Init changelog & version 2.3.0

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

diff --git a/CHANGES.txt b/CHANGES.txt
index b74684b..9bc5d6c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+## Version 2.3.0 du 01/07/2015-03:09
+
+f581aa9 Intégration de la branche pdev-merges
+80d7a73 ajouter les options -b et -s à pdev
+
 ## Version 2.2.0 du 24/06/2015-16:19
 
 98cfdfc Intégration de la branche update-upassword
diff --git a/VERSION.txt b/VERSION.txt
index ccbccc3..276cbf9 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-2.2.0
+2.3.0