[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-183-g9062315

[X2Go dev team]

The branch, master has been updated
       via  9062315b7b9087a8e65885096f1afce25bdd080e (commit)
      from  4324def417f647dff1c96a8296ce08229cf7553a (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 9062315b7b9087a8e65885096f1afce25bdd080e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jun 13 13:10:41 2013 +0200

    release 4.0.0.4 (cherry-picked from release/4.0.0.x branch)
    
    Conflicts:
    	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 a15b65b..f2befcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -71,7 +71,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.4-0~x2go1) UNRELEASED; urgency=low
+x2goserver (4.0.0.4-0~x2go1) unstable; urgency=low
 
   [ Jan Engelhardt ]
   * New upstream version (4.0.0.4):
@@ -79,7 +79,7 @@ x2goserver (4.0.0.4-0~x2go1) UNRELEASED; urgency=low
       not get installed to some system default path for this version
       of x2goserver).
 
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 10 Jun 2013 21:24:02 +0200
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 13 Jun 2013 13:10:28 +0200
 
 x2goserver (4.0.0.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).