Version bump. Updates CHANGES.txt

diff --git a/CHANGES.txt b/CHANGES.txt
index ae0cdc333c858a301518ad5eef3501bf413d699d..870c4f57dcb2b1e695a999e215738c74f4d71293 100644 (file)
--- 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 c36f4e186946c362d63542249cd94510aa28b1f7..4f028bfd693525816ef22eba1a0c76eb4a54e5ee 100644 (file)
--- a/version.php
+++ b/version.php
@@ -14,4 +14,4 @@
 $version = 2012041801;
 
 // Human-friendly version name
-$release = '1.8.4';
+$release = '1.8.5';