From 57e1ef1a203df0d1ea081a16b0d8f9402c7ba636 Mon Sep 17 00:00:00 2001
From: Morgan Collett <morgan.collett@gmail.com>
Date: Wed, 28 Nov 2007 14:03:17 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/chat-activity

---
(limited to 'NEWS')

--
cgit v0.9.1