[X2Go-Commits] [live-build-x2go] 04/47: Merge branch 'feature/openbox' into feature/openbox-magic-pixel-workaround-stretch

[git-admin at x2go.org]

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

x2go pushed a commit to branch feature/openbox-magic-pixel-workaround
in repository live-build-x2go.

commit 1697f7fa20013301a2b588f106c15843e949638a
Merge: 5fb9d1b d2b51c8
Author: Stefan Baur <kontakt at baur-itcs.de>
Date:   Wed Dec 6 20:24:08 2017 +0100

    Merge branch 'feature/openbox' into feature/openbox-magic-pixel-workaround-stretch

 .../lib/live/config/2270-getsshclientkeysfrommedia            | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git