[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-94-g9ae33c2

[X2Go dev team]

The branch, master has been updated
       via  9ae33c2c9546557c6915906627129ef7e9c5c7e2 (commit)
      from  2ec814c564c6f8c035a83538d8a0f1f95f4bf9f1 (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 9ae33c2c9546557c6915906627129ef7e9c5c7e2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Nov 23 12:01:17 2012 +0100

    release 3.1.1.8 (cherry-picked from release branch, changelog update)
    
    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 fdcdfaf..e7c6bf8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,12 +32,12 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 03 Jul 2012 10:03:28 +0200
 
-x2goserver (3.1.1.8-0~x2go2) UNRELEASED; urgency=low
+x2goserver (3.1.1.8-0~x2go1) unstable; urgency=low
 
   * New bugfix release (3.1.1.8):
     - Fix startup of GNOME and UNITY sessions (issue introduced with 3.1.1.7).
 
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 23 Nov 2012 11:59:37 +0100
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 23 Nov 2012 12:01:01 +0100
 
 x2goserver (3.1.1.7-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).