[SCM] kjs packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-9-g6ba193e

[Kubuntu CI (Harald Sitter)]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kjs.git;a=commitdiff;h=6ba193e

The following commit has been merged in the kubuntu_unstable branch:
commit 6ba193ed81599e3777cfbe2763964c71baea41cf
Merge: bcaa684de10ceae136f9a3286ec1d6f3c31f32be 53de20275c5949197a0684a343e4556d6dbd932b
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Thu Jul 30 08:35:11 2015 -0700

    Vivid backports.

 debian/changelog | 2 ++
 1 file changed, 2 insertions(+)

diff --cc debian/changelog
index 76a30de,b6c3215..a13f058
--- a/debian/changelog
+++ b/debian/changelog
@@@ -15,7 -15,7 +15,9 @@@ kjs (5.12.0-0ubuntu1) UNRELEASED; urgen
        __attribute__((always_inline))
  
    [ Scarlett Clark ]
 +  * Batchpatch new symbols. 
+   * Vivid backports. 
++  * Fix merge. 
  
   -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:16:15 -0700
  

-- 
kjs packaging