From 150051a3a9d8fb64a3a6a09de4f1912a7d6a1207 Mon Sep 17 00:00:00 2001
From: Morgan Collett <morgan.collett@gmail.com>
Date: Thu, 22 Nov 2007 14:11:28 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/presence-service

Conflicts:

	NEWS
---
(limited to 'NEWS')

diff --git a/NEWS b/NEWS
index f05f556..3cfb52c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 * #4920: Harden _add_buddies to cope with no handle when calling
   BuddyHandleJoined (morgs)
+* #4993: Only approve subscriptions coming from a trusted server (cassidy)
 
 Snapshot 4c8e8b71b5
 
--
cgit v0.9.1