[pkgsrc/pkgsrc-2012Q1]: pkgsrc/doc pullup 3809

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3f90368907ab
branches:  pkgsrc-2012Q1
changeset: 602136:3f90368907ab
user:      spz <spz%pkgsrc.org@localhost>
date:      Mon May 28 09:57:24 2012 +0000

description:
pullup 3809

diffstat:

 doc/CHANGES-pkgsrc-2012Q1 |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (15 lines):

diff -r 9038e184223f -r 3f90368907ab doc/CHANGES-pkgsrc-2012Q1
--- a/doc/CHANGES-pkgsrc-2012Q1 Mon May 28 09:54:58 2012 +0000
+++ b/doc/CHANGES-pkgsrc-2012Q1 Mon May 28 09:57:24 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-pkgsrc-2012Q1,v 1.1.2.45 2012/05/27 13:33:44 spz Exp $
+$NetBSD: CHANGES-pkgsrc-2012Q1,v 1.1.2.46 2012/05/28 09:57:24 spz Exp $
 
 Changes to the packages collection and infrastructure in pkgsrc-2012Q1:
 
@@ -207,3 +207,5 @@
 textproc/py-feedparser: security update
 Pullup ticket #3806 - requested by morr
 net/haproxy: security update
+Pullup ticket #3809 - requested by schmonz
+www/ikiwiki: security update