From d2ecf45efb44dedf4e5fb002297afe5495a29b8d Mon Sep 17 00:00:00 2001
From: erich koslovsky <erikos@localhost.localdomain>
Date: Mon, 20 Aug 2007 14:17:05 +0000
Subject: Merge branch 'master' of git://dev.laptop.org/web-activity

Removed a few conflicts for the merge.

Conflicts:

	po/Web.pot
	po/ar.po
	po/de.po
	po/el.po
	po/es.po
	po/fr.po
	po/mk.po
	po/pt.po
	po/pt_BR.po
---
(limited to 'activity/activity.info')

--
cgit v0.9.1