This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository python-x2go. from fcc304a Merge branch 'personal/sunweaver/end-of-distutils' into 'master' new 2ec9567 x2go/{backends/control/plain,sshproxy}.py: Don't let look_for_keys override specified private key. The specified private key should win. new 74adacb Merge branch 'personal/sunweaver/specified-key-wins-over-lookforkeys' into 'master' The 2 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. Summary of changes: x2go/backends/control/plain.py | 6 +++--- x2go/sshproxy.py | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git