From 7cfcd8cb1512da50133e8b22c37dedb7daa6de93 Mon Sep 17 00:00:00 2001
From: Morgan Collett <morgan.collett@gmail.com>
Date: Fri, 28 Mar 2008 13:19:32 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/chat-activity

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

--
cgit v0.9.1