From 3e50ac2a3377dbfa9b918e6f68ada7694145a03a Mon Sep 17 00:00:00 2001
From: Morgan Collett <morgan.collett@gmail.com>
Date: Mon, 27 Aug 2007 13:43:29 +0000
Subject: Fix conflict in NEWS

---
(limited to 'activity')

--
cgit v0.9.1