From acaee576c96840240caf58620105fe6c75e95ed7 Mon Sep 17 00:00:00 2001
From: Drake <drake@plainblack.com>
Date: Fri, 3 Nov 2006 15:30:51 +0000
Subject: [PATCH] Add changelog entries for r3138 and r3139, d'oh.

---
 docs/changelog/7.x.x.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 2564350f2..cec973988 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -18,6 +18,10 @@
  - Added an option to the Syndicated Content Wobject that allows use of macros
    inside the RSS Url property.
  - semi-fix: WebGUI/Mail/Send.pm no longer has extraneous UTF-8 BOM
+ - new: RSSCapable mixin for assets that can have RSS feeds, and RSSFromParent
+        asset (automatic) that actually generates the feeds from them.
+ - new: workflow activity and hooks for deleting exported files on trash,
+        purge, and changeUrl
 
 7.1.4
  - Template variables in the main Survey Template were out of date in the