[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=8e29a69

The following commit has been merged in the master branch:
commit 8e29a69e27a99533f51c3b250ddac20df2d35334
Merge: 1d5a8969dea4c6d9b9d6912485789ed41c82513b f397426361752c4b8cd7f082ff98f72e383673ff
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Apr 24 15:21:35 2011 +0100

    Merge branch 'taborder'
    
    Conflicts:
    	gabble/main-options-widget-facebook.ui

 butterfly/main-options-widget.ui             | 18 +++++++++++-------
 gabble/main-options-widget-facebook.ui       |  8 ++++++--
 gabble/proxy-settings-widget.ui              | 10 ++++++++++
 gabble/server-settings-widget.ui             |  9 +++++++++
 haze/yahoo-server-settings-widget.ui         |  9 +++++++++
 sunshine/sunshine-advanced-options-widget.ui |  9 ++++++++-
 6 files changed, 53 insertions(+), 10 deletions(-)

-- 
ktp-accounts-kcm packaging