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 'NEWS')

diff --git a/NEWS b/NEWS
index c564b60..4901064 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+* use sugar tray which enables scrolling for the links (erikos)
+* only try to connect to presence service when offline (erikos)
+
+44
+
+* new design for shared links (erikos)
 * start the activity with in the browser tab open when in joined 
    a shared session or a handle.uri is given (erikos)
 
--
cgit v0.9.1