[X2Go-Commits] [x2goclient] 02/02: Merge branch 'master' of ssh://code.x2go.org:32032/srv/git/code.x2go.org/x2goclient

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 224c29c2aa5153803ffd2f9a58f769d3c8651dcd Merge: 28fed7b 19fe787 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Mon Mar 3 17:04:09 2014 +0100 Merge branch 'master' of ssh://code.x2go.org:32032/srv/git/code.x2go.org/x2goclient Conflicts: debian/changelog debian/changelog | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git