The branch, master has been updated via 24836a91b41708a849afd8e3797f11154c7690d5 (commit) via 65d661aab2fd13518bd5678628816e036efafe86 (commit) from eb2f3b21a3f4ac7d56ffa3ed513164781f99d4a5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 24836a91b41708a849afd8e3797f11154c7690d5 Merge: 65d661a eb2f3b2 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jan 8 15:31:23 2014 +0100 Merge branch 'release/0.4.0.x' commit 65d661aab2fd13518bd5678628816e036efafe86 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jan 7 16:13:38 2014 +0100 happy new year Conflicts (resolved by Mike Gabriel): x2go/backends/profiles/file.py ----------------------------------------------------------------------- Summary of changes: The diff of changes is: hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).