[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-347-gcf15886

[X2Go dev team]

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

    release 4.0.1.11 (cherry-picked from release/4.0.1.x branch)
    
    Conflicts (by Mike Gabriel):
    	debian/changelog

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index fab0f4d..7b681b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -96,15 +96,17 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low
 
  -- Reinhard Tartler <siretart at tauware.de>  Thu, 20 Dec 2012 10:15:26 +0100
 
-x2goserver (4.0.1.11-0x2go1) UNRELEASED; urgency=low
+x2goserver (4.0.1.11-0x2go1) unstable; urgency=low
 
   * New upstream version (4.0.1.11):
     - Fix x2gofm.desktop syntax. (Fixes: #391).
+    - Include all achievements from LTS release branch (as of version
+      4.0.0.9).
   * x2goserver.spec:
     - Enhance requirement of desktop-file-utils, validate x2gofm.desktop
       during package build.
 
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 04 Jan 2014 11:29:35 +0100
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 06 Jan 2014 18:24:49 +0100
 
 x2goserver (4.0.1.10-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).