[SCM] meta-kde-telepathy packaging branch, master, updated. debian/0.8.1-7-g76aaee4

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/meta-kde-telepathy.git;a=commitdiff;h=76aaee4

The following commit has been merged in the master branch:
commit 76aaee40ca267ebde90c04a708505b151354043a
Merge: 776759e178fda0168f737f18eeba5849f52a80df fe5f6436117169107d2e5d56d4fec0de41df3cb0
Author: Diane Trout <diane at ghic.org>
Date:   Tue Jun 9 19:02:08 2015 -0700

    Merge branch 'jessie'
    
    Conflicts:
    	debian/changelog
    	debian/rules

 debian/changelog | 7 ++++---
 debian/control   | 2 +-
 debian/rules     | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

-- 
meta-kde-telepathy packaging