From 871160390bc342b66537db5e70f2bf13c6c08fc8 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Sat, 17 Mar 2007 11:05:19 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity

Conflicts:

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

--
cgit v0.9.1