[SCM] muon packaging branch, gsoc-floris-2014, updated. 0adbafcbb1cfa7bac553f99620889af0815f2554

[Floris-Andrei Stoica-Marcu]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/muon.git;a=commitdiff;h=0adbafc

The following commit has been merged in the gsoc-floris-2014 branch:
commit 0adbafcbb1cfa7bac553f99620889af0815f2554
Author: Floris-Andrei Stoica-Marcu <floris.sm at gmail.com>
Date:   Thu Jul 10 09:33:37 2014 +0300

    Updated copyright
---
 debian/copyright | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 0bd9826..0900707 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,9 +4,12 @@ Upstream-Contact: Jonathan Thomas <echidnaman at kubuntu.org>
 Source: https://projects.kde.org/projects/extragear/sysadmin/muon/repository
 
 Files: *
-Copyright: 2009-2010, Jonathan Thomas <echidnaman at kubuntu.org>
-           2009, Harald Sitter <apachelogger at ubuntu.com>
+Copyright: 2009-2013, Jonathan Thomas <echidnaman at kubuntu.org>
+           2009-2014, Harald Sitter <apachelogger at ubuntu.com>
            2010, Guillaume Martres <smarter at ubuntu.com>
+           Aleix Pol <apol at kde.org>
+           2014-Stoica-Marcu Floris-Andrei <floris.sm at gmail.com>
+           
 License: GPL-2 or GPL-3
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License as

-- 
muon packaging