From 14d2c70e1872f4045fc857be9b9022d085f1fbd1 Mon Sep 17 00:00:00 2001
From: Evan Winslow <evan@elgg.org>
Date: Thu, 17 May 2012 09:57:56 -0700
Subject: Version bump. Updates CHANGES.txt

---
 CHANGES.txt | 6 +++++-
 version.php | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index ae0cdc333..870c4f57d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,9 +1,13 @@
 Version 1.8.5
-(May 15, 2012 from https://github.com/Elgg/Elgg/tree/1.8)
+(May 17, 2012 from https://github.com/Elgg/Elgg/tree/1.8)
  
  Contributing Developers:
   * Brett Profitt
+  * Evan Winslow
   * Sem
+  * Steve Clay
+  * Jeroen Dalsem
+  * Jerome Bakker
 
  Security Enhancements:
   * Fixed possible XSS vulnerability if using a crafted URL.
diff --git a/version.php b/version.php
index c36f4e186..4f028bfd6 100644
--- a/version.php
+++ b/version.php
@@ -14,4 +14,4 @@
 $version = 2012041801;
 
 // Human-friendly version name
-$release = '1.8.4';
+$release = '1.8.5';
-- 
cgit v1.2.3