[openssh-commits] [openssh] branch master updated (111dfb2 -> 6c20392)

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a change to branch master
in repository openssh.

      from  111dfb2   upstream commit
       new  6c20392   fix merge both that broke --without-ssh1 compile

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Detailed log of new commits:

commit 6c2039286f503e2012a58a1d109e389016e7a99b
Author: Damien Miller <djm at mindrot.org>
Date:   Tue Mar 3 13:48:48 2015 -0800

    fix merge both that broke --without-ssh1 compile

Summary of changes:
 ssh-agent.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.