[openssh-commits] [openssh] branch master updated (fdd020e -> 0dc7451)

[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  fdd020e   upstream commit
       new  0dc7451   unbreak merge botch

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 0dc74512bdb105b048883f07de538b37e5e024d4
Author: Damien Miller <djm at mindrot.org>
Date:   Mon Oct 5 18:33:05 2015 -0700

    unbreak merge botch

Summary of changes:
 sandbox-systrace.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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