[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-346-g9eaffc9

[X2Go dev team]

The branch, master has been updated
       via  9eaffc983dc4b08b7edc94e8922642ddfba5a6d1 (commit)
      from  da9cdd0952510a988d6755a8d682da2c08ec5faa (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 9eaffc983dc4b08b7edc94e8922642ddfba5a6d1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jan 6 18:21:49 2014 +0100

    release 4.0.0.9 (cherry-picked from release/4.0.0.9 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 5e522a2..fab0f4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -269,7 +269,7 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 07 Jun 2013 23:07:40 +0200
 
-x2goserver (4.0.0.9-0x2go1) UNRELEASED; urgency=low
+x2goserver (4.0.0.9-0x2go1) unstable; urgency=low
 
   * New upstream version (4.0.0.9):
     - Sanitize session name in x2gostartagent, as well. Fixes problems
@@ -277,7 +277,7 @@ x2goserver (4.0.0.9-0x2go1) UNRELEASED; urgency=low
       sanitized out.
     - Allow dots (".") in sanitized session names.
 
- -- Mike Gabriel <mga at listrac.informatik.uni-kiel.de>  Mon, 06 Jan 2014 12:35:24 +0100
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 06 Jan 2014 18:21:36 +0100
 
 x2goserver (4.0.0.8-0x2go1) 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).