[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-117-g560b64f

[X2Go dev team]

The branch, master has been updated
       via  560b64fc0bf8e511b6a52c81a6fecf42bf3da79e (commit)
      from  eb71cd1ed60e1eb87dfc261e4af0ffe9252e97c7 (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 560b64fc0bf8e511b6a52c81a6fecf42bf3da79e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Dec 30 17:40:12 2012 +0100

    release 4.0.0.0
    
    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 20fd0cc..26bc045 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,7 +36,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.0.0-0~x2go1) UNRELEASED; urgency=low
+x2goserver (4.0.0.0-0~x2go1) unstable; urgency=low
 
   [ Jan Engelhardt ]
   * New upstream version (4.0.0.0):
@@ -68,7 +68,7 @@ x2goserver (4.0.0.0-0~x2go1) UNRELEASED; urgency=low
       problems. Hopefully we find better solutions so that we can reenable
       them soon.
 
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 23 Nov 2012 15:35:48 +0100
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 30 Dec 2012 17:39:44 +0100
 
 x2goserver (3.1.1.9-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).