[SCM] kshisen packaging branch, kubuntu_vivid_archive, updated. debian/14.12.2-1-7-g2da315a

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kshisen.git;a=commitdiff;h=0c3b216

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 0c3b21668eadb25eeeab090bbaae440efe192b0b
Merge: ddcb89cebb52ea900585a17d414015f3d1f37d24 781888d9799040d8bb3eb97277d6f1a117eeb180
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Mar 13 20:11:18 2015 -0700

    Merge remote-tracking branch 'origin/kubuntu_unstable' into kubuntu_vivid_archive
    manual merge

 debian/control         | 55 ++++++++++++++++++++++++++++++++++++++++++++------
 debian/kshisen.install | 13 +-----------
 debian/rules           |  2 +-
 3 files changed, 51 insertions(+), 19 deletions(-)

-- 
kshisen packaging