[SCM] kollision packaging branch, kubuntu_vivid_archive, updated. debian/14.12.2-1-5-g1358172

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 1358172305cf2f65378f464b928b714b2e7bb127
Merge: 8ddf5eaac07e553f058178c9a8b10ee940062043 f75dae7b24992398b47b9f21c5c4be55344942bc
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Mar 13 19:58:22 2015 -0700

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

 debian/control           | 53 ++++++++++++++++++++++++++++++++++++++++++------
 debian/kollision.install | 24 +---------------------
 debian/rules             |  2 +-
 3 files changed, 49 insertions(+), 30 deletions(-)

-- 
kollision packaging