[SCM] okteta packaging branch, kde4.12, updated. debian/4.11.3-3-25-gb83d5bc

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/okteta.git;a=commitdiff;h=da32b2b

The following commit has been merged in the kde4.12 branch:
commit da32b2bd0bf9e79f7b6fed7730383f7e97e072ca
Merge: 9bbdecefa4679e8740cca61c6f227afcdeb8bb4a 3a28af7ab8d826a6cdea730ad1ea983c975c00ee
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Feb 5 01:33:43 2014 +0100

    Merge branch 'master' into kde4.12

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

diff --cc debian/changelog
index 2b630ce,fe774bc..6115a51
--- a/debian/changelog
+++ b/debian/changelog
@@@ -20,9 -20,8 +20,8 @@@ okteta (4:4.12.2-1) UNRELEASED; urgency
    * New patch: install_containedstring
    * New patch: install_selection
    * New patch: install_addressrangelist
-   * New upstream release.
  
 - -- Maximiliano Curia <maxy at debian.org>  Mon, 03 Feb 2014 18:42:37 +0100
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 04 Feb 2014 22:19:33 +0100
  
  okteta (4:4.11.3-3) unstable; urgency=low
  

-- 
okteta packaging