This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 081362875ec31ff4f92b9621d2478fe5cf5b2f15 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jan 20 14:00:52 2014 +0100 release 4.0.0.11 Conflicts (resolved by Mike Gabriel): debian/changelog --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0f5e41a..e56670d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -285,13 +285,13 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 07 Jun 2013 23:07:40 +0200 -x2goserver (4.0.0.11-0x2go1) UNRELEASED; urgency=low +x2goserver (4.0.0.11-0x2go1) unstable; urgency=low * New upstream version (4.0.0.11): - Use perl instead of sed for search+replace in session names sanitizing. (Fixes: #404). - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Jan 2014 18:43:03 +0100 + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 20 Jan 2014 14:00:42 +0100 x2goserver (4.0.0.10-0x2go1) unstable; urgency=low -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git