[SCM] pd-testtools/master: fixed multi-license line

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 49011fdc93c6962fceec9f1c5ad8b48556f335f7
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Tue Sep 8 20:28:49 2015 +0200

    fixed multi-license line

diff --git a/debian/copyright b/debian/copyright
index 3c8b693..28043df 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,7 +11,7 @@ Files: unit-test-frame.pd
 Copyright: 2009, Mathieu Bouchard
  2009, Frank Barknecht
  2011, Katja Vetter and Fred Jan Kraan <katjavetter at gmail.com>
-License: BSD-3-clause & tcltk
+License: BSD-3-clause and tcltk
 
 Files: debian/*
 Copyright: 2015, IOhannes m zmölnig <umlaeute at debian.org>

-- 
pd-testtools packaging