Merge branch 'master' of git+ssh://db.debian.org/git/debian.org

[dsa-metapackages.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 5a23111f03781654184ee6ba3cf444e99a552a7a..82ed4314e3b03ac26dbe15e539e8df416ecffdfb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,16 @@
-debian.org (49) XXstable; urgency=low
+debian.org (50) UNRELEASED; urgency=low
+
+  [ Luca Filipozzi (lfilipoz) ]
+  * Added Luca Filipozzi as a maintainer
+  * Added packages to udd per Lucas Nussbaum
+
+  [ Martin Zobel-Helas ]
+  * debian.org-www-master.debian.org: add opencc
+    as per http://lists.debian.org/<CAFZbbGDFMfHyuwmYxRtdwvszqXFOxqzkj_5Z7U3Sj9JOJ6pxUg@mail.gmail.com>
+
+ -- Martin Zobel-Helas <zobel@debian.org>  Sun, 24 Jun 2012 12:14:24 +0200
+
+debian.org (49) unstable; urgency=low
 
   [ Felipe Augusto van de Wiel (faw) ]
   * Add ddtp.debian.org
@@ -6,13 +18,14 @@ debian.org (49) XXstable; urgency=low
   * Add l10n.debian.org
 
   [ Martin Zobel-Helas ]
-  * decline to have LoadModule and LoadFile in vhosts
+  * apache2-vhost-update:
+    decline to have LoadModule and LoadFile in vhosts
 
   [ Peter Palfrader ]
   * lintian:
     - hardening-includes (>= 2.0)
 
- -- Peter Palfrader <weasel@debian.org>  Wed, 20 Jun 2012 06:55:54 +0200
+ -- Martin Zobel-Helas <zobel@debian.org>  Sun, 24 Jun 2012 12:05:16 +0200
 
 debian.org (48) unstable; urgency=low