[SCM] rocs packaging branch, master, updated. debian/14.12.2-1-5-g5a67227

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/rocs.git;a=commitdiff;h=5a67227

The following commit has been merged in the master branch:
commit 5a672272bcf49c3be0f96502c7df258e44ca30fe
Merge: 2953028263c09f8538d0788c18be8ae30e233446 9da0c0bb7b4719a18e173c984ffd7ac771001412
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Mar 26 20:58:18 2015 +0100

    Merge commit '9da0c0bb7b4719a18e173c984ffd7ac771001412'

 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --cc debian/changelog
index 98bd4bf,ba2e0ea..1eba257
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
 +rocs (4:14.12.3-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (14.12.3).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 26 Mar 2015 12:32:54 +0100
 +
+ rocs (4:14.12.3-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 13:48:21 -0700
+ 
  rocs (4:14.12.2-1) experimental; urgency=medium
  
    * New upstream release (14.12.2).

-- 
rocs packaging