[Pkg-mysql-commits] [mariadb-5.5] 03/03: Merged with upstream 5.5.36

[Otto Kekäläinen]

This is an automated email from the git hooks/post-receive script.

ottok-guest pushed a commit to branch master
in repository mariadb-5.5.

commit 7db25caa57a7114033515e770e72ddd380cf72cf
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Sun Mar 2 01:39:42 2014 +0200

    Merged with upstream 5.5.36
---
 debian/changelog | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c963994..57044b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,16 @@
-mariadb-5.5 (5.5.35-2) UNRELEASED; urgency=medium
+mariadb-5.5 (5.5.36-1) precise; urgency=low
 
   [ Otto Kekäläinen ]
   * Updated Danish debconf translation (Closes #739750)
   * d/control: Added explicit Conflicts/Replaces for mysql-5.6 packages
     (Closes #739841) but a long term solution is perhaps needed
+  * New upstream release imported
 
   [ James Page ]
   * d/control: Drop Nicholas from Uploaders, MIA (Closes: #739360).
   * d/control: Add libjemalloc-dev to BD's.
 
- -- James Page <jamespage at debian.org>  Tue, 18 Feb 2014 09:16:47 +0000
+ -- Otto Kekäläinen <otto at seravo.fi>  Sun, 02 Mar 2014 01:38:26 +0200
 
 mariadb-5.5 (5.5.35-1) unstable; urgency=low
 

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git