From 9167e5a85dc90b86f593eab2860735e79955c88d Mon Sep 17 00:00:00 2001
From: Gary Martin <gary@garycmartin.com>
Date: Thu, 17 Jun 2010 03:56:37 +0000
Subject: Fixed a conflict case I missed.

---
(limited to 'activity.py')

--
cgit v0.9.1