From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-393196-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1RFstn-0005rB-Hz
	for garchives@archives.gentoo.org; Mon, 17 Oct 2011 19:31:00 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id AD9E421C124;
	Mon, 17 Oct 2011 19:29:22 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 81A3B21C123
	for <gentoo-commits@lists.gentoo.org>; Mon, 17 Oct 2011 19:29:22 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 0F1571B401B
	for <gentoo-commits@lists.gentoo.org>; Mon, 17 Oct 2011 19:29:22 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by pelican.gentoo.org (Postfix) with ESMTP id 7664A8005B
	for <gentoo-commits@lists.gentoo.org>; Mon, 17 Oct 2011 19:29:21 +0000 (UTC)
From: "Christian Ruppert" <idl0r@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Christian Ruppert" <idl0r@gentoo.org>
Message-ID: <afb3cda3ff94f547b67f3ec4b99c5318b1b6fdb7.idl0r@gentoo>
Subject: [gentoo-commits] proj/gitolite-gentoo:master commit in: /
X-VCS-Repository: proj/gitolite-gentoo
X-VCS-Committer: idl0r
X-VCS-Committer-Name: Christian Ruppert
X-VCS-Revision: afb3cda3ff94f547b67f3ec4b99c5318b1b6fdb7
Date: Mon, 17 Oct 2011 19:29:21 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 
X-Archives-Hash: b34ffea3a04a2da3694d82e52d4d81b6

commit:     afb3cda3ff94f547b67f3ec4b99c5318b1b6fdb7
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 19:06:55 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 19:06:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gitolite-gent=
oo.git;a=3Dcommit;h=3Dafb3cda3

Merge branch 't/ssh-key-options'

Conflicts:
	src/gitolite.pm