[X2Go-Commits] [python-x2go] 01/02: Merge branch 'release/0.4.0.x'

[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 python-x2go.

commit e3ce176e5eb31be7621166a23739aca2ee6cb47c
Merge: 24836a9 9f1bd9b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Feb 7 13:28:47 2014 +0100

    Merge branch 'release/0.4.0.x'

 debian/changelog                 |   10 ++++++++++
 x2go/backends/control/_stdout.py |    1 -
 x2go/inifiles.py                 |    2 +-
 x2go/utils.py                    |    1 +
 4 files changed, 12 insertions(+), 2 deletions(-)

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