[Pkg-mediawiki-commits] r265 - mediawiki/trunk/debian

[Thorsten Glaser]

Author: tg
Date: 2011-08-02 11:34:00 +0000 (Tue, 02 Aug 2011)
New Revision: 265

Modified:
   mediawiki/trunk/debian/changelog
Log:
since the previous changelog entry was UNRELEASED too, merge them


Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2011-07-26 10:00:33 UTC (rev 264)
+++ mediawiki/trunk/debian/changelog	2011-08-02 11:34:00 UTC (rev 265)
@@ -1,16 +1,13 @@
 mediawiki (1:1.17.0-1) UNRELEASED; urgency=low
 
-  * Remove patches integrated upstream in this version
-
- -- Jonathan Wiltshire <jmw at debian.org>  Sun, 24 Jul 2011 14:43:22 +0100
-
-mediawiki (1:1.15.5-4) UNRELEASED; urgency=low
-
   [ Thorsten Glaser ]
   * debian/patches/fix_invalid_sql.patch: new (Closes: #615983)
 
- -- Thorsten Glaser <tg at mirbsd.de>  Wed, 06 Jul 2011 12:21:31 +0200
+  [ Jonathan Wiltshire ]
+  * Remove patches integrated upstream in this version
 
+ -- Jonathan Wiltshire <jmw at debian.org>  Sun, 24 Jul 2011 14:43:22 +0100
+
 mediawiki (1:1.15.5-3) unstable; urgency=high
 
   [ Thorsten Glaser ]