[SCM] bluedevil packaging branch, kubuntu_stable, updated. debian/1.3.1-1-22-g4b9e69e

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/bluedevil.git;a=commitdiff;h=4b9e69e

The following commit has been merged in the kubuntu_stable branch:
commit 4b9e69e0efb43b06db0fdeebfac4600374bdc571
Merge: 974503fd9127fabb9bfe37591a21c87f429eaffc 0ce4693d732ef3d1c24b97806d83eaadb4fb540b
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Jan 13 18:00:19 2015 +0100

    Merge branch 'kubuntu_unstable' into kubuntu_stable
    
    Conflicts:
    	debian/meta/upstream_scm.json

 debian/changelog |  6 ++++++
 debian/control   | 27 ++++++++++++++++++---------
 debian/rules     |  4 +---
 3 files changed, 25 insertions(+), 12 deletions(-)

-- 
bluedevil packaging