[X2Go-Commits] [x2goclient] 02/03: Merge remote-tracking branch 'refs/remotes/origin/master'

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goclient.

commit b8cb796510cb5ca72e689b277184bfb88b4ae8f3
Merge: bfab25e 2d88750
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Fri Jan 23 12:55:54 2015 +0100

    Merge remote-tracking branch 'refs/remotes/origin/master'
    
    Conflicts:
    	debian/changelog

 debian/changelog |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git