From d33d3521485138551d95d4c4187eb46a90ae4d9d Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 26 Jan 2013 10:27:23 -0500
Subject: Defines river:comment:object:default - taken from PR 438

---
 CHANGES.txt      | 9 ++++++++-
 languages/en.php | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 105d60f72..8b8838e71 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,14 +1,21 @@
 Version 1.8.13
-(January xx, 2013 from https://github.com/Elgg/Elgg/tree/1.8)
+(January 29, 2013 from https://github.com/Elgg/Elgg/tree/1.8)
   Contributing Developers:
    * Cash Costello
+   * Juho Jaakkola
    * Kevin Jardine
    * Krzysztof Różalski
+   * Steve Clay
 
   Security Fixes:
 
   Bugfixes:
    * CLI usages with walled garden fixed
+   * Upgrading from < 1.8 to 1.8 fixed
+   * Default widgets fixed
+   * Quotes in object titles no longer result in "qout" in URLs
+   * List of my groups is ordered now
+   * Language string river:comment:object:default is defined now
 
   Enhancements:
    * Added confirm dialog for resetting profile fields (adds language string profile:resetdefault:confirm)
diff --git a/languages/en.php b/languages/en.php
index 125e2358f..78f37ab63 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -1141,7 +1141,7 @@ If you requested this, click on the link below. Otherwise ignore this email.
 
 	'comments:count' => "%s comments",
 
-	'riveraction:annotation:generic_comment' => '%s commented on %s',
+	'river:comment:object:default' => '%s commented on %s',
 
 	'generic_comments:add' => "Leave a comment",
 	'generic_comments:post' => "Post comment",
-- 
cgit v1.2.3