[SCM] libbluedevil packaging branch, kubuntu_unstable, updated. debian/1.9.3-1-17-gf4ff2d8

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit f4ff2d884fbb035180d9ce2194483a02a2abc3eb
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Jan 13 09:56:54 2015 +0100

    add upstream meta file to set the integration branch to frameworks
    
    Conflicts:
    	debian/meta/upstream_scm.json
---
 debian/meta/upstream_scm.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/meta/upstream_scm.json b/debian/meta/upstream_scm.json
index e86bffb..7c72f79 100644
--- a/debian/meta/upstream_scm.json
+++ b/debian/meta/upstream_scm.json
@@ -1 +1 @@
-{"branch":"Plasma/5.2"}
\ No newline at end of file
+{"branch":"frameworks"}

-- 
libbluedevil packaging