[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-198-g50b316f

[X2Go dev team]

The branch, master has been updated
       via  50b316f1c5e3a13269d03132bcfe98fd5fdd0c6e (commit)
      from  0f5021f4f05e13a02a1e14076ee6dea5bcd65d15 (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 50b316f1c5e3a13269d03132bcfe98fd5fdd0c6e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Jul 27 00:08:30 2013 +0200

    release 4.0.1.4 (cherry-picked from branch releases/4.0.1.x)
    
    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 db88d83..63b6ec1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,7 +51,7 @@ 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.4-0~x2go1) UNRELEASED; urgency=low
+x2goserver (4.0.1.4-0~x2go1) unstable; urgency=low
 
   [ Mike Gabriel ]
   * New upstream version (4.0.1.4):
@@ -67,7 +67,7 @@ x2goserver (4.0.1.4-0~x2go1) UNRELEASED; urgency=low
       starting with GNOME 3.8. Thus, set IMEXIT to false for gnome-terminal.
       (Fixes: #268).
 
- -- Mike Gabriel <mike.gabriel at das-netzwertkeam.de>  Fri, 19 Jul 2013 17:53:11 +0200
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 27 Jul 2013 00:08:15 +0200
 
 x2goserver (4.0.1.3-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).