From 3a45cf2d8cef77208fa95264f233c49a8e9cc51b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robbert=20M=C3=BCller?= <muller@muze.nl>
Date: Fri, 20 May 2016 15:24:34 +0200
Subject: [PATCH 1/2] updated version to 9.6

---
 lib/version.php               |  4 ++--
 www/install/upgrade/tasks.php | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/version.php b/lib/version.php
index ee1812808..a7ff0efb0 100644
--- a/lib/version.php
+++ b/lib/version.php
@@ -1,5 +1,5 @@
 <?php
 	$ARversion = array();
-	$ARversion['version'] = '9.5';
-	$ARversion['date'] = strtotime('2016-03-22');
+	$ARversion['version'] = '9.6';
+	$ARversion['date'] = strtotime('2016-05-20');
 	$ARversion['year'] = strftime('%G', $ARversion['date']);
diff --git a/www/install/upgrade/tasks.php b/www/install/upgrade/tasks.php
index a30ca16b2..022714bc5 100644
--- a/www/install/upgrade/tasks.php
+++ b/www/install/upgrade/tasks.php
@@ -177,17 +177,17 @@
 							"newversion" => "9.3-rc1"
 							));
 		case '9.3-rc1':
-		case '9.3':
-				array_push($todo, array(
-							"description" => "Bumping revision to 9.4",
-							"operation" => "all/dummy.php",
-							"newversion" => "9.4"
-						));
 		case '9.4':
 				array_push($todo, array(
 							"description" => "Update libraries for muze and vedor",
 							"operation" => "all/upgrade.muze.libs.php",
-							"newversion" => "9.5"
+							"newversion" => "9.6"
+						));
+		case '9.5':
+				array_push($todo, array(
+							"description" => "Bumping revision to 9.6",
+							"operation" => "all/dummy.php",
+							"newversion" => "9.6"
 						));
 	
 	}

From d900e6a1780a4eb3416e873567201790116513d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robbert=20M=C3=BCller?= <muller@muze.nl>
Date: Fri, 20 May 2016 15:27:07 +0200
Subject: [PATCH 2/2] add changes

---
 docs/CHANGES | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/CHANGES b/docs/CHANGES
index e0c464459..3bbae3528 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -1,3 +1,21 @@
+===================
+Changes Ariadne 9.6
+===================
+
+Changes
+- IMPORTANT: this release no longer supports old passwords stored as MD5 hashes. If you can no longer login, reset the password using an administrator account. This should only be an issue if you upgrade from a very old Ariadne release (<9).
+- Added ar('loader')->stdin()/stdout()/stderr() functions that return the php IO streams
+- The Ariadne loader now also handles PUT requests, use ar('loader')->stdin() to get the php://input stream
+- Improved security code by using the new random_bytes()/random_int() functions, with a secure fallback for older PHP versions.
+
+Bug fixes
+- Fixed bug in mod_edit that broke grouping of related fields
+- Fixed a number of warnings by better use of isset()
+- Fixed the browse dialog: selection in the right pane and pagination now work again.
+- Fixed incorrect content-length header in cache images that use session placeholders.
+- Fixed a bug in the importer that in very specific circumstances could misapply grants to the wrong group.
+- Fixed that ar_url can handle ar_tainted options and untaint them when applied to a url
+
 ===================
 Changes Ariadne 9.5
 ===================