[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-200-ge634272

[X2Go dev team]

The branch, master has been updated
       via  e6342728d39955d1dbe321a3b5af3fcd16a15989 (commit)
      from  99e3b6282d2db60fe2c0da9a9d19139f96b81419 (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 e6342728d39955d1dbe321a3b5af3fcd16a15989
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 28 02:06:57 2013 +0200

    release 4.0.1.5 (cherry-picked from release/4.0.1.x branch)
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index cb40b53..9f56c61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,13 +51,13 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low
 
  -- Reinhard Tartler <siretart at tauware.de>  Thu, 20 Dec 2012 10:15:26 +0100
 
-x2goserver (4.0.1.5-0~x2go1) UNRELEASED; urgency=low
+x2goserver (4.0.1.5-0~x2go1) unstable; urgency=low
 
   * New upstream version (4.0.1.5):
     - Do not hard-code paths to NX code in x2goruncommand anymore. Use
       x2gopath instead. (Fixes: #273).
 
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 28 Jul 2013 01:50:57 +0200
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 28 Jul 2013 02:06:47 +0200
 
 x2goserver (4.0.1.4-0~x2go1) unstable; urgency=low
 


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

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 "x2goserver.git" (X2Go Server).