[SCM] testy packaging branch, master, updated. c3a8ede438829ced14172a61109b7886aaee3704

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/testy.git;a=commitdiff;h=c3a8ede

The following commit has been merged in the master branch:
commit c3a8ede438829ced14172a61109b7886aaee3704
Merge: 18bfd8d88cf0b5115f131a6bbd9d5bf417718153 2e3682e3607ba23e20b781b9e7f486612d819c6e
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Oct 28 12:13:01 2015 +0000

    merge

 debian/asdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc debian/asdf
index 8339e1e,98fd7d5..fc3a826
--- a/debian/asdf
+++ b/debian/asdf
@@@ -5,6 -4,5 +5,6 @@@ qwe
  asdfasdf
  
  asdad
 +asdfasdf
 +qwe
- 
+ asdasd
 -

-- 
testy packaging