[SCM] ktimer packaging branch, kubuntu_vivid_archive, updated. debian/14.12.2-1-10-g2829d51

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 2829d517139f8dcbfd6fb26f5c5389f4e18f828a
Merge: 4ab63b3fdfd1fe878fca45b948913e352cf5121c 40077c0a308165b38a2188504982cfbd5610bb6a
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Mar 13 20:30:43 2015 -0700

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

 debian/changelog                |  1 +
 debian/control                  | 13 ++++++++++---
 debian/ktimer.lintian-overrides |  1 +
 debian/rules                    |  2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

-- 
ktimer packaging