[X2Go-Commits] [x2goserver] 02/02: release 4.0.1.13 (cherry-picked from release/4.0.1.x branch)

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 94a359cfe1ea2ada39d6ac198485bfb4e9c3434a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jan 20 14:05:58 2014 +0100

    release 4.0.1.13 (cherry-picked from release/4.0.1.x branch)
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog
---
 debian/changelog |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e56670d..a0b0042 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -96,7 +96,15 @@ 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.12-0x2go2) UNRELEASED; urgency=low
+x2goserver (4.0.1.13-0x2go1) unstable; urgency=low
+
+  * New upstream version (4.0.1.13):
+    - Include all achievements from LTS release branch (as of version
+      4.0.0.11).
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 20 Jan 2014 14:04:01 +0100
+
+x2goserver (4.0.1.12-0x2go2) unstable; urgency=low
 
   * Build hotfix for RPM packages (x2goserver.spec):
     + Add perl(Capture::Tiny) to Requires: field of x2goserver.

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git