[SCM] Kross interpreters packaging branch, master, updated. debian/4.12.2-2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kross-interpreters.git;a=commitdiff;h=7f34eb5

The following commit has been merged in the master branch:
commit 7f34eb5701a691767ece410f733339025869e2b1
Merge: 82f7b17c52e06eb5b49a45d1fce912af8c0301f9 0e09c24792c18fab92b176081b7a7a7564097d2b
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Apr 28 12:19:29 2014 +0200

    Merge branch 'kde4.12' of git://git.debian.org/pkg-kde/kde-sc/kross-interpreters into kde4.12

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

diff --cc debian/changelog
index a923a23,44c8efc..38246a3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,9 @@@
 -kross-interpreters (4:4.12.2-2) UNRELEASED; urgency=medium
 +kross-interpreters (4:4.12.2-2~1) UNRELEASED; urgency=medium
  
    [ Pino Toscano ]
-   * Merge 4:4.11.5-3 upload.
+   * Merge changes from the 4:4.11.5-3 upload.
  
 - -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 12 Apr 2014 13:06:26 +0200
 + -- Maximiliano Curia <maxy at debian.org>  Sat, 12 Apr 2014 20:12:07 +0200
  
  kross-interpreters (4:4.12.2-1) experimental; urgency=medium
  

-- 
Kross interpreters packaging