From 6ae5e4111a76f9cb8f59ae6dfc9123365df39467 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Sat, 01 Sep 2007 09:11:36 +0000
Subject: Merge branch 'master' into json

Conflicts:

	model.py
	webactivity.py
---
(limited to 'activity/activity.info')

diff --git a/activity/activity.info b/activity/activity.info
index 6f145e6..3faad9d 100755
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Browse
-activity_version = 43
+activity_version = 44
 service_name = org.laptop.WebActivity
 icon = activity-web
 class = webactivity.WebActivity
--
cgit v0.9.1