[pkgsrc/trunk]: pkgsrc/doc Updated security/openpam to 20140912

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6abeaad03528
branches:  trunk
changeset: 652786:6abeaad03528
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Jun 07 22:46:48 2015 +0000

description:
Updated security/openpam to 20140912

diffstat:

 doc/CHANGES-2015 |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r e1d541a6dbfb -r 6abeaad03528 doc/CHANGES-2015
--- a/doc/CHANGES-2015  Sun Jun 07 22:46:08 2015 +0000
+++ b/doc/CHANGES-2015  Sun Jun 07 22:46:48 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2015,v 1.2549 2015/06/07 22:44:04 joerg Exp $
+$NetBSD: CHANGES-2015,v 1.2550 2015/06/07 22:46:48 joerg Exp $
 
 Changes to the packages collection and infrastructure in 2015:
 
@@ -4787,6 +4787,9 @@
        Updated graphics/MesaLib to 10.5.7 [tnn 2015-06-07]
        Updated misc/ruby-daemons to 1.2.2 [taca 2015-06-07]
        Updated misc/ruby-equalizer to 0.0.11 [taca 2015-06-07]
+<<<<<<< CHANGES-2015
+       Updated security/openpam to 20140912 [joerg 2015-06-07]
+=======
        Updated databases/postgresql93 to 9.3.8 [joerg 2015-06-07]
        Updated databases/postgresql93-adminpack to 9.3.8 [joerg 2015-06-07]
        Updated databases/postgresql93-client to 9.3.8 [joerg 2015-06-07]
@@ -4802,3 +4805,5 @@
        Updated databases/postgresql93-replicationtools to 9.3.8 [joerg 2015-06-07]
        Updated databases/postgresql93-server to 9.3.8 [joerg 2015-06-07]
        Updated databases/postgresql93-upgrade to 9.3.8 [joerg 2015-06-07]
+>>>>>>> 1.2549
+       Updated security/openpam to 20140912 [joerg 2015-06-07]