[SCM] oxygen-icons5 packaging branch, master, updated. 65aa7282c9308bff4eb18902a83fc503e5f60030

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit f316785a3fb13a37945b08aa333ed1e47fae83dd
Merge: 0161bdeabc00ee965e44dad30dc1b3709d405760 1b4c759a085c3d52e4349029729e5068089d2230
Author: Modestas Vainius <modax at debian.org>
Date:   Sat May 26 17:56:27 2012 +0300

    Merge branch 'master' into kde4.8
    
    Conflicts:
    	debian/changelog

 debian/changelog | 7 +++++++
 debian/control   | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index beb7d9c,ae2ba03..d503539
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
 +oxygen-icons (4:4.8.3-0r1) UNRELEASED; urgency=low
 +
 +  * New upstream release.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 06 Jan 2012 16:54:19 +0100
 +
+ oxygen-icons (4:4.7.4-2) unstable; urgency=low
+ 
+   * Team upload. Upload to unsable.
+   * Update uploaders, remove Armin.
+ 
+  -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Tue, 06 Mar 2012 11:54:52 +0100
+ 
  oxygen-icons (4:4.7.4-1) experimental; urgency=low
  
    * New upstream release.

-- 
oxygen-icons5 packaging