# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1313044607 0
# Node ID 257b013533343ce439b731a05266839cbbffa2c1
# Parent  4151dad5bd00cbe5dea469d733a6f4e7257febf1# Parent  c164dcad5e28ddf1f0f7b3cf84de7f2a1bdc0ff1
merge of '56ec802a4201a596a1bf852cae8f08819ca6bedc'
     and 'f1442997e656d73d0aad5c9daf3de27983b7cc1b'

diff -r c164dcad5e28 -r 257b01353334 libpurple/protocols/sametime/sametime.c
--- a/libpurple/protocols/sametime/sametime.c	Mon Aug 08 21:49:06 2011 +0000
+++ b/libpurple/protocols/sametime/sametime.c	Thu Aug 11 06:36:47 2011 +0000
@@ -924,7 +924,7 @@
 
   if (!name) {
     DEBUG_WARN("Can't ensure a null group\n");
-    return;
+    return NULL;
   }
 
   DEBUG_INFO("attempting to ensure group %s, called %s\n",