Received: from mail.netbsd.org (mail.netbsd.org [149.20.53.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id F1E1FA6549 for ; Fri, 13 Jun 2014 21:51:44 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 074FD14A443; Fri, 13 Jun 2014 21:51:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2C82214A442 for ; Fri, 13 Jun 2014 21:51:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at NetBSD.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.NetBSD.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id vSd83XdfNagi for ; Fri, 13 Jun 2014 21:51:41 +0000 (UTC) Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id A572714A3BE for ; Fri, 13 Jun 2014 21:51:41 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id 41EB696; Fri, 13 Jun 2014 21:51:41 +0000 (UTC) Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" MIME-Version: 1.0 Date: Fri, 13 Jun 2014 21:51:41 +0000 From: "Amitai Schlair" Subject: CVS commit: pkgsrc/www/ikiwiki To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20140613215141.41EB696@cvs.netbsd.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk Module Name: pkgsrc Committed By: schmonz Date: Fri Jun 13 21:51:41 UTC 2014 Modified Files: pkgsrc/www/ikiwiki: Makefile distinfo Log Message: Update to 3.20140613. From the changelog: * only_committed_changes could fail in a git repository merged with git merge -s ours. * Remove google from openid selector, per http://xkcd.com/1361/ To generate a diff of this commit: cvs rdiff -u -r1.119 -r1.120 pkgsrc/www/ikiwiki/Makefile cvs rdiff -u -r1.96 -r1.97 pkgsrc/www/ikiwiki/distinfo Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.