[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=2da1e71

The following commit has been merged in the master branch:
commit 2da1e71bebf29bfe1c8819ab49f9606ec97d77ef
Merge: 1c8190708eac8a5f6b7c0d1163f2a6f52149268a a6adc53b5a027e17b4fbf138c5af8eb27ed04b68
Author: Lasse Liehu <lliehu at kolumbus.fi>
Date:   Sun Jan 9 13:10:42 2011 +0200

    Merge branch 'master' of git.kde.org:telepathy-accounts-kcm-plugins

 butterfly/main-options-widget.ui | 26 ++++++++++++++++----------
 gabble/main-options-widget.ui    | 15 +--------------
 2 files changed, 17 insertions(+), 24 deletions(-)

-- 
ktp-accounts-kcm packaging