[SCM] prison packaging branch, master, updated. 374d836c216bec30bb6904e6597fdea00872bd6c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/prison.git;a=commitdiff;h=f021b98

The following commit has been merged in the master branch:
commit f021b98b8b54c784624299cecd16e07d2e744c84
Merge: 07f039621af07ce6dada3c5396836807fa1371c4 a98fdcaf44fdffd3863d513a3bc0b9ddd1ce6492
Author: Harald Sitter <sitter at kde.org>
Date:   Tue May 3 13:06:14 2016 +0200

    Merging master into Neon/unstable

 debian/.gitattributes | 1 +
 debian/watch          | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

-- 
prison packaging