This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 02aaf19c0f81e9206dde723f2dbd57cf53172c7a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jan 28 13:42:16 2014 +0100 Continue development on main release/4.0.1.x branch... Conflicts (resolved by Mike Gabriel): debian/changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index a0b0042..d8618e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -96,6 +96,12 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low -- Reinhard Tartler <siretart@tauware.de> Thu, 20 Dec 2012 10:15:26 +0100 +x2goserver (4.0.1.14-0x2go1) UNRELEASED; urgency=low + + * Continue development on main release/4.0.1.x branch... + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 28 Jan 2014 13:41:38 +0100 + x2goserver (4.0.1.13-0x2go1) unstable; urgency=low * New upstream version (4.0.1.13): -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git