[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=a3a8da7

The following commit has been merged in the master branch:
commit a3a8da73ecdcf2e4e45cef00132bb9b637c8cc46
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Mar 23 23:55:35 2013 +0000

    Fix address of conference server for Google group chats
    
    BUG: 316677
---
 data/profiles/google-talk.profile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/profiles/google-talk.profile b/data/profiles/google-talk.profile
index c290f22..8694091 100644
--- a/data/profiles/google-talk.profile
+++ b/data/profiles/google-talk.profile
@@ -12,7 +12,7 @@
     <parameter name="port"    type="u" mandatory="1">5223</parameter>
     <parameter name="old-ssl" type="b" mandatory="1"
                label="Use old-style SSL">1</parameter>
-    <parameter name="fallback-conference-server">conference.jabber.org</parameter>
+    <parameter name="fallback-conference-server">groupchat.google.com</parameter>
   </parameters>
 
   <presences allow-others="1">

-- 
ktp-accounts-kcm packaging