[X2Go-Commits] [live-build-x2go] 13/18: Merge branch 'feature/openbox' into feature/mate-minidesktop

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/mate-minidesktop in repository live-build-x2go. commit c97ca5d4f402525d075ccbed03b3768be1f698dc Merge: 0446080 4cc1a51 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Thu Dec 7 11:07:30 2017 +0100 Merge branch 'feature/openbox' into feature/mate-minidesktop .../lib/live/config/2260-getsshhostkeysfrommedia | 11 +++++++---- .../lib/live/config/2270-getsshclientkeysfrommedia | 18 ++++++------------ 2 files changed, 13 insertions(+), 16 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git